@deerdesign/deertools 1.2.4 → 1.2.6

package/package.json

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

package/src/cli.js

@@ -35,6 +35,7 @@ async function main(argv) {
     mcp: c.cmdMcp, doctor: c.cmdDoctor, audit: c.cmdAudit, profile: c.cmdProfile,
     completion: c.cmdCompletion, catalog: c.cmdCatalog, deliveries: c.cmdDeliveries,
     supplier: c.cmdSupplier, rendermind: c.cmdRendermind, baselinker: c.cmdBaseLinker,
+    update: require('./updater').cmdUpdate,
   };
 
   if (pos.length === 0 && !flags.help && !flags.version && process.stdout.isTTY) {
@@ -48,15 +49,28 @@ async function main(argv) {
 
   const cmd = pos.shift() || 'help';
 
-  if (cmd === 'help' || cmd === '--help' || flags.help) { process.stdout.write(c.HELP); return 0; }
-  if (cmd === '--version' || cmd === 'version' || flags.version) { process.stdout.write(`${require('../package.json').version}\n`); return 0; }
-  if (!table[cmd]) { process.stderr.write(`Nieznana komenda „${cmd}”.\n${c.HELP}`); return 2; }
+  const shouldCheck = !flags.json && cmd !== 'update' && process.env.NODE_ENV !== 'test';
+  const updatePromise = shouldCheck ? require('./updater').checkUpdate().catch(() => null) : null;
+
+  const finish = async (code = 0) => {
+    if (updatePromise) {
+      try {
+        const info = await updatePromise;
+        if (info && info.hasUpdate) require('./updater').printUpdateNotice(info);
+      } catch (_) {}
+    }
+    return code;
+  };
+
+  if (cmd === 'help' || cmd === '--help' || flags.help) { process.stdout.write(c.HELP); return finish(0); }
+  if (cmd === '--version' || cmd === 'version' || flags.version) { process.stdout.write(`${require('../package.json').version}\n`); return finish(0); }
+  if (!table[cmd]) { process.stderr.write(`Nieznana komenda „${cmd}”.\n${c.HELP}`); return finish(2); }
   try {
     await table[cmd](pos, flags);
-    return 0;
+    return finish(0);
   } catch (e) {
     if (!e.silent) process.stderr.write(`Błąd: ${e.message}\n`);
-    return e.exitCode || 1;
+    return finish(e.exitCode || 1);
   }
 }
 

package/src/commands.js

@@ -41,27 +41,18 @@ async function cmdLogin(pos, flags) {
     }
   }
 
-  if (pos[0] === 'skills' || pos[0] === 'hub' || pos[0] === 'skill') {
+  if ((pos[0] === 'skills' || pos[0] === 'hub' || pos[0] === 'skill') && (pos[1] || flags.token)) {
     out(`\n=== DeerSkills Hub ===`);
     try {
-      const { loginSkillsBrowser, loginSkillsDirect } = require('./skills-login');
+      const { 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
-        });
-      }
+      await loginSkillsDirect(token);
       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);
+      fail('Nie udało się zapisać klucza do DeerSkills Hub.', 1);
     }
   }
 
@@ -69,17 +60,6 @@ async function cmdLogin(pos, flags) {
   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 });
@@ -563,6 +543,7 @@ Integracje MCP i Agenci AI (DeerSkills Hub):
   deertools api <produkt> <METODA> </ścieżka>           Wywołuje bezpośrednio API produktu.
 
 Narzędzia systemowe:
+  deertools update                                      Sprawdza i podpowiada aktualizację CLI.
   deertools doctor [--json]                             Pełna diagnostyka połączeń, portów i kluczy.
   deertools audit [--limit 25] [--clear] [--json]       Historia operacji i wywołań API.
   deertools completion [install|zsh|bash]               Autouzupełnianie w powłoce po wciśnięciu Tab.

package/src/login.js

@@ -83,26 +83,61 @@ async function exchangeCode(product, tokenEndpoint, { code, verifier, redirectUr
   if (!res.ok || !json || !json.access_token) {
     throw new Error(`Wymiana kodu na klucz nie powiodła się (${res.status}${json && json.error ? `: ${json.error}` : ''}). Spróbuj zalogować się ponownie.`);
   }
-  if (!String(json.access_token).startsWith(product.keyPrefix)) {
+  const isExpectedPrefix = String(json.access_token).startsWith(product.keyPrefix);
+  const isSkillsJwt = product.id === 'skills' && String(json.access_token).startsWith('ey') && json.access_token.includes('.');
+  if (!isExpectedPrefix && !isSkillsJwt) {
     throw new Error(`Produkt zwrócił nieoczekiwany klucz (oczekiwano prefiksu ${product.keyPrefix}…).`);
   }
+  let email = json.email || null;
+  let expires_at = json.expires_at || null;
+  if (isSkillsJwt) {
+    try {
+      const parts = json.access_token.split('.');
+      if (parts.length >= 2) {
+        const payload = JSON.parse(Buffer.from(parts[1], 'base64').toString('utf8'));
+        if (!email && payload.email) email = payload.email;
+        if (!expires_at && payload.exp) expires_at = new Date(payload.exp * 1000).toISOString();
+      }
+    } catch (_) {}
+  }
   return {
     key: json.access_token,
-    email: json.email || null,
+    email: email,
     scope: json.scope || 'read',
-    expires_at: json.expires_at || null,
+    expires_at: expires_at,
     logged_at: new Date().toISOString(),
   };
 }
 
 /** Adresy OAuth z metadanych serwera (RFC 8414) opublikowanych przez produkt. */
 async function discoverOAuth(product, fetchImpl = fetch) {
-  const url = `${product.site}/.well-known/oauth-authorization-server`;
+  let url = `${product.site}/.well-known/oauth-authorization-server`;
   let res;
-  try { res = await fetchImpl(url, { headers: { Accept: 'application/json', 'User-Agent': 'deertools-cli' } }); } catch (e) {
-    throw new Error(`Nie można pobrać metadanych OAuth produktu ${product.name} (${url}): ${e.message}`);
+  try {
+    res = await fetchImpl(url, { headers: { Accept: 'application/json', 'User-Agent': 'deertools-cli' } });
+  } catch (e) {
+    if (product.id === 'skills') {
+      const fallbackSite = process.env.DEERTOOLS_SKILLS_URL || 'https://skill-garden-vault.lovable.app';
+      url = `${fallbackSite}/.well-known/oauth-authorization-server`;
+      try {
+        res = await fetchImpl(url, { headers: { Accept: 'application/json', 'User-Agent': 'deertools-cli' } });
+      } catch (_) {}
+    }
   }
-  if (!res.ok) throw new Error(`Produkt ${product.name} nie opublikował jeszcze metadanych OAuth (${url} → ${res.status}). Logowanie z CLI nie jest tam dostępne.`);
+
+  if (!res || !res.ok) {
+    if (product.authorizeUrl && product.tokenUrl && !opts_is_mock(fetchImpl)) {
+      const authEndpoint = product.id === 'skills' ? 'https://skill-garden-vault.lovable.app/oauth/authorize' : product.authorizeUrl;
+      return {
+        authorization_endpoint: authEndpoint,
+        token_endpoint: product.tokenUrl,
+        code_challenge_methods_supported: ['S256'],
+      };
+    }
+    if (!res) throw new Error(`Nie można pobrać metadanych OAuth produktu ${product.name} (${url}).`);
+    throw new Error(`Produkt ${product.name} nie opublikował jeszcze metadanych OAuth (${url} → ${res.status}). Logowanie z CLI nie jest tam dostępne.`);
+  }
+
   let meta;
   try { meta = JSON.parse(await res.text()); } catch (_) { throw new Error(`Metadane OAuth produktu ${product.name} nie są poprawnym JSON-em.`); }
   if (!meta.authorization_endpoint || !meta.token_endpoint) throw new Error(`Metadane OAuth produktu ${product.name} nie zawierają authorization_endpoint / token_endpoint.`);
@@ -113,6 +148,10 @@ async function discoverOAuth(product, fetchImpl = fetch) {
   return meta;
 }
 
+function opts_is_mock(f) {
+  return f !== fetch && typeof global !== 'undefined' && f !== global.fetch;
+}
+
 function page(title, body, ok) {
   const color = ok ? '#10b981' : '#ef4444';
   return `<!doctype html><html lang="pl"><meta charset="utf-8"><title>DeerTools CLI</title><body style="font-family:-apple-system,Segoe UI,Roboto,sans-serif;background:#09090b;color:#f4f4f5;text-align:center;padding:60px 20px"><div style="max-width:480px;margin:0 auto;background:#18181b;border:1px solid #27272a;border-radius:16px;padding:40px"><h1 style="color:${color};font-size:22px">${escapeHtml(title)}</h1><p style="color:#a1a1aa;line-height:1.5">${escapeHtml(body)}</p></div></body></html>`;

package/src/updater.js

@@ -0,0 +1,128 @@
+'use strict';
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+const CACHE_TTL_MS = 12 * 60 * 60 * 1000; // 12 hours
+const REGISTRY_URL = 'https://registry.npmjs.org/@deerdesign/deertools/latest';
+const PKG = require('../package.json');
+
+function getCachePath() {
+  const dir = path.join(os.homedir(), '.deertools');
+  try {
+    if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+  } catch (_) {}
+  return path.join(dir, 'update-check.json');
+}
+
+function compareSemver(a, b) {
+  const pa = String(a).replace(/^v/, '').split('.').map(Number);
+  const pb = String(b).replace(/^v/, '').split('.').map(Number);
+  for (let i = 0; i < 3; i++) {
+    const na = pa[i] || 0;
+    const nb = pb[i] || 0;
+    if (na > nb) return 1;
+    if (na < nb) return -1;
+  }
+  return 0;
+}
+
+async function fetchLatestVersion() {
+  const ctrl = new AbortController();
+  const t = setTimeout(() => ctrl.abort(), 2500);
+  try {
+    const res = await fetch(REGISTRY_URL, {
+      headers: { 'Accept': 'application/json', 'User-Agent': 'deertools-cli' },
+      signal: ctrl.signal,
+    });
+    if (!res.ok) return null;
+    const json = await res.json();
+    return json.version || null;
+  } catch (_) {
+    return null;
+  } finally {
+    clearTimeout(t);
+  }
+}
+
+async function checkUpdate() {
+  const cacheFile = getCachePath();
+  const now = Date.now();
+  let cached = null;
+
+  try {
+    if (fs.existsSync(cacheFile)) {
+      cached = JSON.parse(fs.readFileSync(cacheFile, 'utf8'));
+    }
+  } catch (_) {}
+
+  let latestVersion = cached && cached.latestVersion ? cached.latestVersion : null;
+
+  if (!cached || !cached.lastChecked || (now - cached.lastChecked > CACHE_TTL_MS)) {
+    const fetched = await fetchLatestVersion();
+    if (fetched) {
+      latestVersion = fetched;
+      try {
+        fs.writeFileSync(cacheFile, JSON.stringify({ lastChecked: now, latestVersion }), 'utf8');
+      } catch (_) {}
+    }
+  }
+
+  if (latestVersion && compareSemver(latestVersion, PKG.version) > 0) {
+    return {
+      hasUpdate: true,
+      current: PKG.version,
+      latest: latestVersion,
+    };
+  }
+
+  return { hasUpdate: false, current: PKG.version, latest: latestVersion };
+}
+
+function printUpdateNotice(updateInfo) {
+  if (!updateInfo || !updateInfo.hasUpdate) return;
+  const { current, latest } = updateInfo;
+  const line1 = `Dostępna nowa wersja DeerTools CLI: ${current} → ${latest}`;
+  const line2 = `Zaktualizuj: npm install -g @deerdesign/deertools@latest`;
+  const line3 = `lub użyj:    npx -y @deerdesign/deertools@latest <komenda>`;
+  const len = Math.max(line1.length, line2.length, line3.length) + 4;
+  const border = '─'.repeat(len);
+
+  process.stderr.write(`\n\x1b[33m┌${border}┐\x1b[0m\n`);
+  process.stderr.write(`\x1b[33m│  ${line1.padEnd(len - 2)}│\x1b[0m\n`);
+  process.stderr.write(`\x1b[33m│  ${line2.padEnd(len - 2)}│\x1b[0m\n`);
+  process.stderr.write(`\x1b[33m│  ${line3.padEnd(len - 2)}│\x1b[0m\n`);
+  process.stderr.write(`\x1b[33m└${border}┘\x1b[0m\n\n`);
+}
+
+async function cmdUpdate(pos, flags) {
+  process.stdout.write(`Sprawdzam aktualizacje w rejestrze npm...\n`);
+  const latest = await fetchLatestVersion();
+  if (!latest) {
+    process.stdout.write(`Nie udało się połączyć z rejestrem npm. Sprawdź połączenie z internetem.\n`);
+    return 1;
+  }
+
+  const cmp = compareSemver(latest, PKG.version);
+  if (cmp <= 0) {
+    process.stdout.write(`✓ DeerTools CLI jest w najnowszej wersji (${PKG.version}).\n`);
+    return 0;
+  }
+
+  process.stdout.write(`\nZnaleziono nowszą wersję: ${PKG.version} → \x1b[32m${latest}\x1b[0m\n\n`);
+  process.stdout.write(`Aby zaktualizować instalację globalną, uruchom:\n`);
+  process.stdout.write(`  \x1b[36mnpm install -g @deerdesign/deertools@latest\x1b[0m\n\n`);
+  process.stdout.write(`Jeśli instalacja wymaga uprawnień administratora:\n`);
+  process.stdout.write(`  \x1b[36msudo npm install -g @deerdesign/deertools@latest\x1b[0m\n\n`);
+  process.stdout.write(`A jeśli korzystasz z npx, każda komenda zawsze pobiera najnowszą wersję z tagiem @latest:\n`);
+  process.stdout.write(`  \x1b[36mnpx -y @deerdesign/deertools@latest <komenda>\x1b[0m\n\n`);
+  return 0;
+}
+
+module.exports = {
+  checkUpdate,
+  printUpdateNotice,
+  cmdUpdate,
+  compareSemver,
+  fetchLatestVersion,
+};