@hasna/mcps 0.0.20 → 0.0.22

package/dist/mcp/index.js

@@ -3508,7 +3508,7 @@ class JSONSchemaGenerator {
               if (val === undefined) {
                 if (this.unrepresentable === "throw") {
                   throw new Error("Literal `undefined` cannot be represented in JSON Schema");
-                } else {}
+                }
               } else if (typeof val === "bigint") {
                 if (this.unrepresentable === "throw") {
                   throw new Error("BigInt literals cannot be represented in JSON Schema");
@@ -5685,14 +5685,14 @@ import { join, relative } from "path";
 import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync, writeFileSync } from "fs";
 import { homedir as homedir2 } from "os";
 import { join as join2 } from "path";
-import { readdirSync as readdirSync2, existsSync as existsSync3 } from "fs";
-import { join as join3 } from "path";
-import { homedir as homedir3 } from "os";
+import { readdirSync as readdirSync3, existsSync as existsSync6 } from "fs";
+import { join as join6 } from "path";
+import { homedir as homedir5 } from "os";
 import { hostname as hostname2 } from "os";
-import { homedir as homedir4 } from "os";
-import { join as join4 } from "path";
-import { join as join6, dirname } from "path";
-import { homedir as homedir5, platform } from "os";
+import { homedir as homedir3 } from "os";
+import { join as join3 } from "path";
+import { join as join5, dirname } from "path";
+import { homedir as homedir4, platform } from "os";
 function __accessProp2(key) {
   return this[key];
 }
@@ -6620,11 +6620,11 @@ function isSyncExcludedTable(table) {
   return SYNC_EXCLUDED_TABLE_PATTERNS.some((p) => p.test(table));
 }
 function discoverServices() {
-  const dataDir = join3(homedir3(), ".hasna");
-  if (!existsSync3(dataDir))
+  const dataDir = join6(homedir5(), ".hasna");
+  if (!existsSync6(dataDir))
     return [];
   try {
-    const entries = readdirSync2(dataDir, { withFileTypes: true });
+    const entries = readdirSync3(dataDir, { withFileTypes: true });
     return entries.filter((e) => {
       if (!e.isDirectory())
         return false;
@@ -6636,30 +6636,30 @@ function discoverServices() {
     return [];
   }
 }
-function discoverSyncableServices() {
+function discoverSyncableServices2() {
   const local = discoverServices();
   const pgSet = new Set(KNOWN_PG_SERVICES);
   return local.filter((s) => pgSet.has(s));
 }
 function getServiceDbPath(service) {
-  const dataDir = join3(homedir3(), ".hasna", service);
-  if (!existsSync3(dataDir))
+  const dataDir = join6(homedir5(), ".hasna", service);
+  if (!existsSync6(dataDir))
     return null;
   const candidates = [
-    join3(dataDir, `${service}.db`),
-    join3(dataDir, "data.db"),
-    join3(dataDir, "database.db")
+    join6(dataDir, `${service}.db`),
+    join6(dataDir, "data.db"),
+    join6(dataDir, "database.db")
   ];
   try {
-    const files = readdirSync2(dataDir);
+    const files = readdirSync3(dataDir);
     for (const f of files) {
       if (f.endsWith(".db") && !f.endsWith("-wal") && !f.endsWith("-shm")) {
-        candidates.push(join3(dataDir, f));
+        candidates.push(join6(dataDir, f));
       }
     }
   } catch {}
   for (const p of candidates) {
-    if (existsSync3(p))
+    if (existsSync6(p))
       return p;
   }
   return null;
@@ -6966,9 +6966,9 @@ async function syncTransfer(source, target, options, _direction) {
           const batch = rows.slice(offset, offset + batchSize);
           try {
             if (isAsyncAdapter(target)) {
-              await batchUpsertPg(target, table, columns, updateCols, pkColumns, batch, columns.includes(conflictColumn) ? conflictColumn : undefined);
+              await batchUpsertPg(target, table, columns, updateCols, pkColumns, batch);
             } else {
-              batchUpsertSqlite(target, table, columns, updateCols, pkColumns, batch, columns.includes(conflictColumn) ? conflictColumn : undefined);
+              batchUpsertSqlite(target, table, columns, updateCols, pkColumns, batch);
             }
             result.rowsWritten += batch.length;
           } catch (err) {
@@ -7015,7 +7015,7 @@ async function syncTransfer(source, target, options, _direction) {
   }
   return results;
 }
-async function batchUpsertPg(target, table, columns, updateCols, primaryKeys, batch, conflictColumn) {
+async function batchUpsertPg(target, table, columns, updateCols, primaryKeys, batch) {
   if (batch.length === 0)
     return;
   const colList = columns.map((c) => `"${c}"`).join(", ");
@@ -7025,22 +7025,20 @@ async function batchUpsertPg(target, table, columns, updateCols, primaryKeys, ba
   }).join(", ");
   const pkList = primaryKeys.map((c) => `"${c}"`).join(", ");
   const setClause = updateCols.length > 0 ? updateCols.map((c) => `"${c}" = EXCLUDED."${c}"`).join(", ") : `"${primaryKeys[0]}" = EXCLUDED."${primaryKeys[0]}"`;
-  const whereClause = conflictColumn && updateCols.includes(conflictColumn) ? ` WHERE "${table}"."${conflictColumn}" IS NULL OR EXCLUDED."${conflictColumn}" >= "${table}"."${conflictColumn}"` : "";
   const sql = `INSERT INTO "${table}" (${colList}) VALUES ${valuePlaceholders}
-    ON CONFLICT (${pkList}) DO UPDATE SET ${setClause}${whereClause}`;
+    ON CONFLICT (${pkList}) DO UPDATE SET ${setClause}`;
   const params = batch.flatMap((row) => columns.map((c) => row[c] ?? null));
   await target.run(sql, ...params);
 }
-function batchUpsertSqlite(target, table, columns, updateCols, primaryKeys, batch, conflictColumn) {
+function batchUpsertSqlite(target, table, columns, updateCols, primaryKeys, batch) {
   if (batch.length === 0)
     return;
   const colList = columns.map((c) => `"${c}"`).join(", ");
   const valuePlaceholders = batch.map(() => `(${columns.map(() => "?").join(", ")})`).join(", ");
   const pkList = primaryKeys.map((c) => `"${c}"`).join(", ");
   const setClause = updateCols.length > 0 ? updateCols.map((c) => `"${c}" = EXCLUDED."${c}"`).join(", ") : `"${primaryKeys[0]}" = EXCLUDED."${primaryKeys[0]}"`;
-  const whereClause = conflictColumn && updateCols.includes(conflictColumn) ? ` WHERE "${table}"."${conflictColumn}" IS NULL OR EXCLUDED."${conflictColumn}" >= "${table}"."${conflictColumn}"` : "";
   const sql = `INSERT INTO "${table}" (${colList}) VALUES ${valuePlaceholders}
-    ON CONFLICT (${pkList}) DO UPDATE SET ${setClause}${whereClause}`;
+    ON CONFLICT (${pkList}) DO UPDATE SET ${setClause}`;
   const params = batch.flatMap((row) => columns.map((c) => coerceForSqlite(row[c])));
   target.run(sql, ...params);
 }
@@ -7265,7 +7263,7 @@ class SyncProgressTracker {
     }
   }
 }
-function registerCloudTools(server, serviceName, opts = {}) {
+function registerCloudTools(server, serviceName) {
   server.tool(`${serviceName}_cloud_status`, "Show cloud configuration and connection health", {}, async () => {
     const config2 = getCloudConfig();
     const lines = [
@@ -7298,13 +7296,8 @@ function registerCloudTools(server, serviceName, opts = {}) {
         isError: true
       };
     }
-    const local = new SqliteAdapter(opts.dbPath ?? getDbPath(serviceName));
+    const local = new SqliteAdapter(getDbPath(serviceName));
     const cloud = new PgAdapterAsync(getConnectionString(serviceName));
-    if (opts.migrations?.length) {
-      for (const sql of opts.migrations) {
-        await cloud.run(sql);
-      }
-    }
     const tableList = tablesStr ? tablesStr.split(",").map((t) => t.trim()) : listSqliteTables(local);
     const results = await syncPush(local, cloud, { tables: tableList });
     local.close();
@@ -7326,7 +7319,7 @@ function registerCloudTools(server, serviceName, opts = {}) {
         isError: true
       };
     }
-    const local = new SqliteAdapter(opts.dbPath ?? getDbPath(serviceName));
+    const local = new SqliteAdapter(getDbPath(serviceName));
     const cloud = new PgAdapterAsync(getConnectionString(serviceName));
     let tableList;
     if (tablesStr) {
@@ -15631,7 +15624,7 @@ See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode de
   __export2(exports_discover, {
     isSyncExcludedTable: () => isSyncExcludedTable,
     getServiceDbPath: () => getServiceDbPath,
-    discoverSyncableServices: () => discoverSyncableServices,
+    discoverSyncableServices: () => discoverSyncableServices2,
     discoverServices: () => discoverServices,
     SYNC_EXCLUDED_TABLE_PATTERNS: () => SYNC_EXCLUDED_TABLE_PATTERNS,
     KNOWN_PG_SERVICES: () => KNOWN_PG_SERVICES
@@ -15686,15 +15679,13 @@ See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode de
   init_config();
   init_config();
   init_dotfile();
-  init_adapter();
   init_config();
-  init_discover();
-  AUTO_SYNC_CONFIG_PATH = join4(homedir4(), ".hasna", "cloud", "config.json");
+  AUTO_SYNC_CONFIG_PATH = join3(homedir3(), ".hasna", "cloud", "config.json");
   init_config();
   init_adapter();
   init_dotfile();
   init_config();
-  CONFIG_DIR2 = join6(homedir5(), ".hasna", "cloud");
+  CONFIG_DIR2 = join5(homedir4(), ".hasna", "cloud");
   init_adapter();
   init_config();
   init_discover();
@@ -29935,18 +29926,18 @@ var init_mcp = __esm(() => {
 });
 
 // src/lib/version.ts
-import { existsSync as existsSync4, readFileSync as readFileSync2 } from "fs";
-import { dirname as dirname2, join as join5 } from "path";
+import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
+import { dirname as dirname2, join as join4 } from "path";
 import { fileURLToPath } from "url";
 function readPackageVersion(moduleUrl, fallback = FALLBACK_VERSION) {
   const baseDir = dirname2(fileURLToPath(moduleUrl));
   const candidates = [
-    join5(baseDir, "..", "..", "package.json"),
-    join5(baseDir, "..", "package.json"),
-    join5(baseDir, "package.json")
+    join4(baseDir, "..", "..", "package.json"),
+    join4(baseDir, "..", "package.json"),
+    join4(baseDir, "package.json")
   ];
   for (const candidate of candidates) {
-    if (!existsSync4(candidate))
+    if (!existsSync3(candidate))
       continue;
     try {
       const pkg = JSON.parse(readFileSync2(candidate, "utf-8"));
@@ -29962,14 +29953,14 @@ var init_version = () => {};
 // src/lib/config.ts
 import { join as join7 } from "path";
 import { homedir as homedir6 } from "os";
-import { existsSync as existsSync6, mkdirSync as mkdirSync3, cpSync } from "fs";
+import { existsSync as existsSync5, mkdirSync as mkdirSync3, cpSync } from "fs";
 function resolveMcpsDir() {
   const explicit = process.env.HASNA_MCPS_DATA_DIR ?? process.env.MCPS_DATA_DIR;
   if (explicit)
     return explicit;
   const newDir = join7(homedir6(), ".hasna", "mcps");
   const oldDir = join7(homedir6(), ".mcps");
-  if (!existsSync6(newDir) && existsSync6(oldDir)) {
+  if (!existsSync5(newDir) && existsSync5(oldDir)) {
     mkdirSync3(join7(homedir6(), ".hasna"), { recursive: true });
     cpSync(oldDir, newDir, { recursive: true });
   }
@@ -30595,7 +30586,7 @@ var init_db = __esm(() => {
 
 // src/lib/credentials.ts
 import { existsSync as existsSync7, readFileSync as readFileSync3 } from "fs";
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 function normalizeKey(key) {
   return key.trim();
 }
@@ -30669,7 +30660,7 @@ function normalizeLiteralEnv(env) {
   return normalized;
 }
 function readLocalVault() {
-  const path = process.env.HASNA_MCPS_CREDENTIAL_VAULT_PATH ?? join8(MCPS_DIR, "credentials.local.json");
+  const path = process.env.HASNA_MCPS_CREDENTIAL_VAULT_PATH ?? join9(MCPS_DIR, "credentials.local.json");
   if (!existsSync7(path))
     return {};
   const parsed = JSON.parse(readFileSync3(path, "utf-8"));
@@ -31186,15 +31177,15 @@ __export(exports_sources, {
   clearCache: () => clearCache,
   addSource: () => addSource
 });
-import { mkdirSync as mkdirSync6, existsSync as existsSync8, readFileSync as readFileSync4, writeFileSync as writeFileSync2, readdirSync as readdirSync3, unlinkSync } from "fs";
-import { join as join9 } from "path";
+import { mkdirSync as mkdirSync6, existsSync as existsSync9, readFileSync as readFileSync4, writeFileSync as writeFileSync2, readdirSync as readdirSync2, unlinkSync } from "fs";
+import { join as join10 } from "path";
 function getCacheFile(sourceId) {
-  return join9(CACHE_DIR, `${sourceId}.json`);
+  return join10(CACHE_DIR, `${sourceId}.json`);
 }
 function readCache(sourceId) {
   try {
     const file = getCacheFile(sourceId);
-    if (!existsSync8(file))
+    if (!existsSync9(file))
       return null;
     const data = JSON.parse(readFileSync4(file, "utf-8"));
     return data;
@@ -31210,15 +31201,15 @@ function writeCache(sourceId, results) {
 }
 function clearCache(sourceId) {
   try {
-    if (!existsSync8(CACHE_DIR))
+    if (!existsSync9(CACHE_DIR))
       return;
-    const files = readdirSync3(CACHE_DIR);
+    const files = readdirSync2(CACHE_DIR);
     for (const file of files) {
       if (!file.endsWith(".json"))
         continue;
       if (!sourceId || file.startsWith(`${sourceId}.`)) {
         try {
-          unlinkSync(join9(CACHE_DIR, file));
+          unlinkSync(join10(CACHE_DIR, file));
         } catch {}
       }
     }
@@ -31464,7 +31455,7 @@ var CACHE_DIR, DEFAULT_TTL_MS;
 var init_sources = __esm(() => {
   init_db();
   init_config2();
-  CACHE_DIR = join9(MCPS_DIR, "cache");
+  CACHE_DIR = join10(MCPS_DIR, "cache");
   DEFAULT_TTL_MS = 10 * 60 * 1000;
 });
 
@@ -31482,8 +31473,8 @@ var init_finder = __esm(() => {
 
 // src/lib/install.ts
 import { execFileSync } from "child_process";
-import { existsSync as existsSync9, readFileSync as readFileSync5, writeFileSync as writeFileSync3, mkdirSync as mkdirSync7 } from "fs";
-import { join as join10 } from "path";
+import { existsSync as existsSync10, readFileSync as readFileSync5, writeFileSync as writeFileSync3, mkdirSync as mkdirSync7 } from "fs";
+import { join as join11 } from "path";
 import { homedir as homedir8 } from "os";
 function installToClaude(entry) {
   try {
@@ -31507,9 +31498,9 @@ function installToClaude(entry) {
 }
 function installToCodex(entry) {
   try {
-    const configDir = join10(homedir8(), ".codex");
-    const configPath = join10(configDir, "config.toml");
-    if (!existsSync9(configDir)) {
+    const configDir = join11(homedir8(), ".codex");
+    const configPath = join11(configDir, "config.toml");
+    if (!existsSync10(configDir)) {
       mkdirSync7(configDir, { recursive: true });
     }
     const block = `
@@ -31517,7 +31508,7 @@ function installToCodex(entry) {
 ` + `command = ${JSON.stringify(entry.command)}
 ` + `args = [${entry.args.map((a) => JSON.stringify(a)).join(", ")}]
 `;
-    const existing = existsSync9(configPath) ? readFileSync5(configPath, "utf-8") : "";
+    const existing = existsSync10(configPath) ? readFileSync5(configPath, "utf-8") : "";
     if (existing.includes(`[mcp_servers.${entry.id}]`)) {
       return { agent: "codex", success: true };
     }
@@ -31529,13 +31520,13 @@ function installToCodex(entry) {
 }
 function installToGemini(entry) {
   try {
-    const configDir = join10(homedir8(), ".gemini");
-    const configPath = join10(configDir, "settings.json");
-    if (!existsSync9(configDir)) {
+    const configDir = join11(homedir8(), ".gemini");
+    const configPath = join11(configDir, "settings.json");
+    if (!existsSync10(configDir)) {
       mkdirSync7(configDir, { recursive: true });
     }
     let settings = {};
-    if (existsSync9(configPath)) {
+    if (existsSync10(configPath)) {
       settings = JSON.parse(readFileSync5(configPath, "utf-8"));
     }
     if (!settings.mcpServers)
@@ -34939,15 +34930,15 @@ var init_machines = __esm(() => {
 
 // src/lib/fleet.ts
 import { spawn as spawn2 } from "child_process";
-import { existsSync as existsSync10, mkdirSync as mkdirSync8, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "fs";
-import { join as join11 } from "path";
+import { existsSync as existsSync11, mkdirSync as mkdirSync8, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "fs";
+import { join as join12 } from "path";
 function normalizeQueryList(values) {
   const trimmed = values?.map((value) => value.trim()).filter(Boolean);
   return trimmed && trimmed.length > 0 ? trimmed : undefined;
 }
 function readCatalogCache(maxAgeMs) {
   try {
-    if (!existsSync10(CATALOG_CACHE_PATH))
+    if (!existsSync11(CATALOG_CACHE_PATH))
       return null;
     const parsed = JSON.parse(readFileSync6(CATALOG_CACHE_PATH, "utf-8"));
     if (!parsed.cachedAt || !Array.isArray(parsed.entries))
@@ -34961,7 +34952,7 @@ function readCatalogCache(maxAgeMs) {
 }
 function writeCatalogCache(entries) {
   try {
-    mkdirSync8(join11(MCPS_DIR, "cache"), { recursive: true });
+    mkdirSync8(join12(MCPS_DIR, "cache"), { recursive: true });
     writeFileSync4(CATALOG_CACHE_PATH, JSON.stringify({ cachedAt: Date.now(), entries }, null, 2), "utf-8");
   } catch {}
 }
@@ -35635,7 +35626,7 @@ var NPM_SEARCH_URL = "https://registry.npmjs.org/-/v1/search", NPM_REGISTRY_URL
 var init_fleet = __esm(() => {
   init_config2();
   init_machines();
-  CATALOG_CACHE_PATH = join11(MCPS_DIR, "cache", "hasna-catalog.json");
+  CATALOG_CACHE_PATH = join12(MCPS_DIR, "cache", "hasna-catalog.json");
   DEFAULT_CATALOG_CACHE_TTL_MS = 60 * 60 * 1000;
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/mcps",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "description": "Meta-MCP registry & CLI — discover, manage, and proxy MCP servers",
   "type": "module",
   "repository": {
@@ -43,7 +43,8 @@
     "postinstall": "mkdir -p $HOME/.hasna/mcps/cache 2>/dev/null || true"
   },
   "dependencies": {
-    "@hasna/cloud": "^0.1.24",
+    "@hasna/cloud": "0.1.24",
+    "@hasna/events": "^0.1.6",
     "@modelcontextprotocol/sdk": "^1.26.0",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",