@hasna/mcps 0.0.15 → 0.0.16

package/bin/index.js

@@ -12040,6 +12040,7 @@ function getDb() {
       command TEXT NOT NULL,
       args TEXT NOT NULL DEFAULT '[]',
       env TEXT NOT NULL DEFAULT '{}',
+      credential_refs TEXT NOT NULL DEFAULT '{}',
       transport TEXT NOT NULL DEFAULT 'stdio',
       url TEXT,
       source TEXT NOT NULL DEFAULT 'local',
@@ -12066,6 +12067,9 @@ function getDb() {
   try {
     db.exec("ALTER TABLE servers ADD COLUMN last_error TEXT");
   } catch {}
+  try {
+    db.exec("ALTER TABLE servers ADD COLUMN credential_refs TEXT NOT NULL DEFAULT '{}'");
+  } catch {}
   db.exec(`
     CREATE TABLE IF NOT EXISTS sources (
       id TEXT PRIMARY KEY,
@@ -19126,17 +19130,17 @@ __export(exports_sources, {
   clearCache: () => clearCache,
   addSource: () => addSource
 });
-import { mkdirSync as mkdirSync6, existsSync as existsSync6, readFileSync as readFileSync2, writeFileSync as writeFileSync2, readdirSync as readdirSync3, unlinkSync } from "fs";
-import { join as join7 } from "path";
+import { mkdirSync as mkdirSync6, existsSync as existsSync7, readFileSync as readFileSync3, writeFileSync as writeFileSync2, readdirSync as readdirSync3, unlinkSync } from "fs";
+import { join as join8 } from "path";
 function getCacheFile(sourceId) {
-  return join7(CACHE_DIR, `${sourceId}.json`);
+  return join8(CACHE_DIR, `${sourceId}.json`);
 }
 function readCache(sourceId) {
   try {
     const file = getCacheFile(sourceId);
-    if (!existsSync6(file))
+    if (!existsSync7(file))
       return null;
-    const data = JSON.parse(readFileSync2(file, "utf-8"));
+    const data = JSON.parse(readFileSync3(file, "utf-8"));
     return data;
   } catch {
     return null;
@@ -19150,7 +19154,7 @@ function writeCache(sourceId, results) {
 }
 function clearCache(sourceId) {
   try {
-    if (!existsSync6(CACHE_DIR))
+    if (!existsSync7(CACHE_DIR))
       return;
     const files = readdirSync3(CACHE_DIR);
     for (const file of files) {
@@ -19158,7 +19162,7 @@ function clearCache(sourceId) {
         continue;
       if (!sourceId || file.startsWith(`${sourceId}.`)) {
         try {
-          unlinkSync(join7(CACHE_DIR, file));
+          unlinkSync(join8(CACHE_DIR, file));
         } catch {}
       }
     }
@@ -19404,7 +19408,7 @@ var CACHE_DIR, DEFAULT_TTL_MS;
 var init_sources = __esm(() => {
   init_db();
   init_config2();
-  CACHE_DIR = join7(MCPS_DIR, "cache");
+  CACHE_DIR = join8(MCPS_DIR, "cache");
   DEFAULT_TTL_MS = 10 * 60 * 1000;
 });
 
@@ -19412,7 +19416,7 @@ var init_sources = __esm(() => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@hasna/mcps",
-    version: "0.0.15",
+    version: "0.0.16",
     description: "Meta-MCP registry & CLI \u2014 discover, manage, and proxy MCP servers",
     type: "module",
     repository: {
@@ -21142,10 +21146,164 @@ var {
 import React10 from "react";
 import { render } from "ink";
 import chalk2 from "chalk";
-import { readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "fs";
+import { readFileSync as readFileSync7, writeFileSync as writeFileSync5 } from "fs";
 
 // src/lib/registry.ts
 init_db();
+
+// src/lib/credentials.ts
+init_config2();
+import { existsSync as existsSync6, readFileSync as readFileSync2 } from "fs";
+import { join as join7 } from "path";
+
+class CredentialReferenceError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "CredentialReferenceError";
+  }
+}
+var SECRET_KEY_PATTERN = /(?:^|[_-])(api[_-]?key|token|secret|password|passwd|credential|auth|private[_-]?key)(?:$|[_-])/i;
+var SECRET_VALUE_PATTERN = /^(sk_(?:live|test)_[A-Za-z0-9_]+|ghp_[A-Za-z0-9_]+|github_pat_[A-Za-z0-9_]+|xox[baprs]-[A-Za-z0-9-]+|AIza[A-Za-z0-9_-]{20,}|eyJ[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+)$/;
+var REDACTED_CREDENTIAL_VALUE = "<redacted>";
+function normalizeKey(key) {
+  return key.trim();
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isSecretLikeEnvKey(key) {
+  return SECRET_KEY_PATTERN.test(key);
+}
+function isSecretLikeValue(value) {
+  return SECRET_VALUE_PATTERN.test(value.trim());
+}
+function normalizeCredentialRef(ref) {
+  const source = ref.source;
+  if (source !== "env" && source !== "local-vault" && source !== "hosted") {
+    throw new CredentialReferenceError(`Unsupported credential reference source: ${String(source)}`);
+  }
+  const name = ref.name?.trim();
+  if (!name) {
+    throw new CredentialReferenceError("Credential reference name is required");
+  }
+  return {
+    source,
+    name,
+    required: ref.required !== false,
+    ...ref.description ? { description: ref.description } : {}
+  };
+}
+function normalizeCredentialRefs(refs) {
+  const normalized = {};
+  for (const [rawKey, ref] of Object.entries(refs ?? {})) {
+    const key = normalizeKey(rawKey);
+    if (!key)
+      throw new CredentialReferenceError("Credential reference env key is required");
+    normalized[key] = normalizeCredentialRef(ref);
+  }
+  return normalized;
+}
+function parseCredentialRefs(value) {
+  if (!isRecord(value))
+    return {};
+  const refs = {};
+  for (const [key, ref] of Object.entries(value)) {
+    if (!isRecord(ref))
+      continue;
+    const source = ref.source;
+    const name = ref.name;
+    if ((source === "env" || source === "local-vault" || source === "hosted") && typeof name === "string" && name.trim()) {
+      refs[key] = normalizeCredentialRef({
+        source,
+        name,
+        required: typeof ref.required === "boolean" ? ref.required : true,
+        description: typeof ref.description === "string" ? ref.description : undefined
+      });
+    }
+  }
+  return refs;
+}
+function normalizeLiteralEnv(env) {
+  const normalized = {};
+  for (const [rawKey, rawValue] of Object.entries(env ?? {})) {
+    const key = normalizeKey(rawKey);
+    if (!key)
+      continue;
+    const value = String(rawValue);
+    if (isSecretLikeEnvKey(key) || isSecretLikeValue(value)) {
+      throw new CredentialReferenceError(`Refusing to store raw secret-like env value for "${key}". Use a credential reference instead.`);
+    }
+    normalized[key] = value;
+  }
+  return normalized;
+}
+function redactEnv(env) {
+  const redacted = {};
+  for (const [key, value] of Object.entries(env)) {
+    redacted[key] = isSecretLikeEnvKey(key) || isSecretLikeValue(value) ? REDACTED_CREDENTIAL_VALUE : value;
+  }
+  return redacted;
+}
+function redactServerCredentials(server) {
+  return {
+    ...server,
+    env: redactEnv(server.env),
+    credentialRefs: normalizeCredentialRefs(server.credentialRefs)
+  };
+}
+function readLocalVault() {
+  const path = process.env.HASNA_MCPS_CREDENTIAL_VAULT_PATH ?? join7(MCPS_DIR, "credentials.local.json");
+  if (!existsSync6(path))
+    return {};
+  const parsed = JSON.parse(readFileSync2(path, "utf-8"));
+  if (!isRecord(parsed))
+    return {};
+  const values = {};
+  for (const [key, value] of Object.entries(parsed)) {
+    if (typeof value === "string")
+      values[key] = value;
+  }
+  return values;
+}
+function resolveCredentialRef(envKey, ref) {
+  if (ref.source === "env") {
+    const value = process.env[ref.name];
+    if (value === undefined && ref.required !== false) {
+      throw new CredentialReferenceError(`Missing required environment credential "${ref.name}" for "${envKey}"`);
+    }
+    return value;
+  }
+  if (ref.source === "local-vault") {
+    const value = readLocalVault()[ref.name];
+    if (value === undefined && ref.required !== false) {
+      throw new CredentialReferenceError(`Missing required local vault credential "${ref.name}" for "${envKey}"`);
+    }
+    return value;
+  }
+  if (ref.required !== false) {
+    throw new CredentialReferenceError(`Hosted credential "${ref.name}" for "${envKey}" cannot be resolved by the local runtime`);
+  }
+  return;
+}
+function resolveServerEnv(server) {
+  const resolved = { ...server.env };
+  const refs = normalizeCredentialRefs(server.credentialRefs);
+  for (const [envKey, ref] of Object.entries(refs)) {
+    const value = resolveCredentialRef(envKey, ref);
+    if (value !== undefined)
+      resolved[envKey] = value;
+  }
+  return resolved;
+}
+function credentialRefPlaceholders(refs) {
+  const placeholders = {};
+  for (const key of Object.keys(refs ?? {})) {
+    placeholders[key] = REDACTED_CREDENTIAL_VALUE;
+  }
+  return placeholders;
+}
+
+// src/lib/registry.ts
 function parseRow(row) {
   return {
     id: row.id,
@@ -21154,6 +21312,7 @@ function parseRow(row) {
     command: row.command,
     args: safeJsonParse(row.args, []),
     env: safeJsonParse(row.env, {}),
+    credentialRefs: parseCredentialRefs(safeJsonParse(row.credential_refs, {})),
     transport: row.transport,
     url: row.url || null,
     source: row.source,
@@ -21221,9 +21380,9 @@ function addServer(opts) {
   if (!id) {
     throw new Error("Unable to generate a valid server ID");
   }
-  const row = db2.prepare(`INSERT INTO servers (id, name, description, command, args, env, transport, url, source)
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
-       RETURNING *`).get(id, name, opts.description || null, command, JSON.stringify(opts.args || []), JSON.stringify(opts.env || {}), opts.transport || "stdio", opts.url || null, opts.source || "local");
+  const row = db2.prepare(`INSERT INTO servers (id, name, description, command, args, env, credential_refs, transport, url, source)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+       RETURNING *`).get(id, name, opts.description || null, command, JSON.stringify(opts.args || []), JSON.stringify(normalizeLiteralEnv(opts.env)), JSON.stringify(normalizeCredentialRefs(opts.credentialRefs)), opts.transport || "stdio", opts.url || null, opts.source || "local");
   return parseRow(row);
 }
 function removeServer(id) {
@@ -21262,7 +21421,11 @@ function updateServer(id, updates) {
   }
   if (updates.env !== undefined) {
     sets.push("env = ?");
-    values.push(JSON.stringify(updates.env));
+    values.push(JSON.stringify(normalizeLiteralEnv(updates.env)));
+  }
+  if (updates.credentialRefs !== undefined) {
+    sets.push("credential_refs = ?");
+    values.push(JSON.stringify(normalizeCredentialRefs(updates.credentialRefs)));
   }
   if (updates.transport !== undefined) {
     sets.push("transport = ?");
@@ -21296,7 +21459,7 @@ function setServerEnv(id, key, value) {
   if (!server)
     throw new Error(`Server "${id}" not found`);
   const env = { ...server.env, [key]: value };
-  db2.prepare("UPDATE servers SET env = ?, updated_at = datetime('now') WHERE id = ?").run(JSON.stringify(env), id);
+  db2.prepare("UPDATE servers SET env = ?, updated_at = datetime('now') WHERE id = ?").run(JSON.stringify(normalizeLiteralEnv(env)), id);
 }
 function unsetServerEnv(id, key) {
   const db2 = getDb();
@@ -21307,6 +21470,23 @@ function unsetServerEnv(id, key) {
   delete env[key];
   db2.prepare("UPDATE servers SET env = ?, updated_at = datetime('now') WHERE id = ?").run(JSON.stringify(env), id);
 }
+function setServerCredentialRef(id, key, ref) {
+  const db2 = getDb();
+  const server = getServer(id);
+  if (!server)
+    throw new Error(`Server "${id}" not found`);
+  const credentialRefs = normalizeCredentialRefs({ ...server.credentialRefs ?? {}, [key]: ref });
+  db2.prepare("UPDATE servers SET credential_refs = ?, updated_at = datetime('now') WHERE id = ?").run(JSON.stringify(credentialRefs), id);
+}
+function unsetServerCredentialRef(id, key) {
+  const db2 = getDb();
+  const server = getServer(id);
+  if (!server)
+    throw new Error(`Server "${id}" not found`);
+  const credentialRefs = { ...server.credentialRefs ?? {} };
+  delete credentialRefs[key];
+  db2.prepare("UPDATE servers SET credential_refs = ?, updated_at = datetime('now') WHERE id = ?").run(JSON.stringify(normalizeCredentialRefs(credentialRefs)), id);
+}
 function cacheTools(serverId, tools) {
   const db2 = getDb();
   const insert = db2.prepare("INSERT INTO tool_cache (server_id, name, description, input_schema) VALUES (?, ?, ?, ?)");
@@ -21346,6 +21526,7 @@ function cloneServer(id, newName) {
     command: server.command,
     args: server.args,
     env: server.env,
+    credentialRefs: server.credentialRefs,
     transport: server.transport,
     url: server.url ?? undefined,
     source: server.source
@@ -35615,8 +35796,8 @@ var DESTRUCTIVE_COMMANDS = new Set([
 ]);
 var SHELL_EVAL_FLAGS = new Set(["-c", "/c", "-Command", "-command", "-EncodedCommand", "-encodedcommand"]);
 var SECRET_FLAG_PATTERN = /(?:^|[-_])(api[-_]?key|token|secret|password|passwd|credential|auth|private[-_]?key)(?:$|[-_])/i;
-var SECRET_KEY_PATTERN = /(?:^|[_-])(api[_-]?key|token|secret|password|passwd|credential|auth|private[_-]?key)(?:$|[_-])/i;
-var SECRET_VALUE_PATTERN = /^(sk_(?:live|test)_[A-Za-z0-9_]+|ghp_[A-Za-z0-9_]+|github_pat_[A-Za-z0-9_]+|xox[baprs]-[A-Za-z0-9-]+|AIza[A-Za-z0-9_-]{20,}|eyJ[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+)$/;
+var SECRET_KEY_PATTERN2 = /(?:^|[_-])(api[_-]?key|token|secret|password|passwd|credential|auth|private[_-]?key)(?:$|[_-])/i;
+var SECRET_VALUE_PATTERN2 = /^(sk_(?:live|test)_[A-Za-z0-9_]+|ghp_[A-Za-z0-9_]+|github_pat_[A-Za-z0-9_]+|xox[baprs]-[A-Za-z0-9-]+|AIza[A-Za-z0-9_-]{20,}|eyJ[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+)$/;
 var SHELL_META_PATTERN = /[;&|`<>]|\$\(/;
 function commandBase(command) {
   return command.trim().split(/[\\/]/).pop()?.toLowerCase() || command.trim().toLowerCase();
@@ -35625,10 +35806,10 @@ function normalizeArgs(args) {
   return (args ?? []).map((arg) => String(arg));
 }
 function isSecretKey(key) {
-  return SECRET_KEY_PATTERN.test(key) || SECRET_FLAG_PATTERN.test(key);
+  return SECRET_KEY_PATTERN2.test(key) || SECRET_FLAG_PATTERN.test(key);
 }
 function isSecretValue(value) {
-  return SECRET_VALUE_PATTERN.test(value.trim());
+  return SECRET_VALUE_PATTERN2.test(value.trim());
 }
 function isSecretAssignment(arg) {
   const eqIdx = arg.indexOf("=");
@@ -35815,14 +35996,14 @@ async function connectToServer(entry, options = {}) {
         assertLocalCommandConsent({
           command: entry.command,
           args: entry.args,
-          env: entry.env,
+          env: { ...entry.env, ...credentialRefPlaceholders(entry.credentialRefs) },
           transport: entry.transport,
           operation: "launch"
         }, options.localCommandConsent);
         transport = new StdioClientTransport({
           command: entry.command,
           args: entry.args,
-          env: buildEnv(entry.env)
+          env: buildEnv(resolveServerEnv(entry))
         });
       } else if (entry.transport === "sse") {
         transport = new SSEClientTransport(requireUrl(entry));
@@ -35967,7 +36148,7 @@ async function diagnoseServer(server, options = {}) {
       assertLocalCommandConsent({
         command: server.command,
         args: server.args,
-        env: server.env,
+        env: { ...server.env, ...credentialRefPlaceholders(server.credentialRefs) },
         transport: server.transport,
         operation: "diagnose"
       }, options.localCommandConsent);
@@ -35996,12 +36177,29 @@ async function diagnoseServer(server, options = {}) {
     }
   }
   const missingEnv = Object.entries(server.env).filter(([, v]) => !v);
-  if (Object.keys(server.env).length === 0) {
-    checks4.push({ name: "env vars", pass: true, message: "no env vars required" });
-  } else if (missingEnv.length > 0) {
-    checks4.push({ name: "env vars", pass: false, message: `missing values for: ${missingEnv.map(([k]) => k).join(", ")}` });
+  const credentialRefCount = Object.keys(server.credentialRefs ?? {}).length;
+  let credentialError = null;
+  try {
+    resolveServerEnv(server);
+  } catch (err) {
+    credentialError = err.message;
+  }
+  if (Object.keys(server.env).length === 0 && credentialRefCount === 0) {
+    checks4.push({ name: "env vars", pass: true, message: "no env vars or credential refs required" });
+  } else if (missingEnv.length > 0 || credentialError) {
+    const parts = [];
+    if (missingEnv.length > 0)
+      parts.push(`missing literal values for: ${missingEnv.map(([k]) => k).join(", ")}`);
+    if (credentialError)
+      parts.push(credentialError);
+    checks4.push({ name: "env vars", pass: false, message: parts.join("; ") });
   } else {
-    checks4.push({ name: "env vars", pass: true, message: `${Object.keys(server.env).length} env var(s) set` });
+    const literalCount = Object.keys(server.env).length;
+    checks4.push({
+      name: "env vars",
+      pass: true,
+      message: `${literalCount} literal env var(s), ${credentialRefCount} credential ref(s) available`
+    });
   }
   if (server.transport !== "stdio" && server.url) {
     try {
@@ -36118,8 +36316,8 @@ init_sources();
 
 // src/lib/install.ts
 import { execFileSync as execFileSync2 } from "child_process";
-import { existsSync as existsSync7, readFileSync as readFileSync3, writeFileSync as writeFileSync3, mkdirSync as mkdirSync7 } from "fs";
-import { join as join8 } from "path";
+import { existsSync as existsSync8, readFileSync as readFileSync4, writeFileSync as writeFileSync3, mkdirSync as mkdirSync7 } from "fs";
+import { join as join9 } from "path";
 import { homedir as homedir8 } from "os";
 function installToClaude(entry) {
   try {
@@ -36131,7 +36329,7 @@ function installToClaude(entry) {
       "--scope",
       "user"
     ];
-    for (const [k, v] of Object.entries(entry.env)) {
+    for (const [k, v] of Object.entries(assertAgentInstallEnv(entry))) {
       args.push("--env", `${k}=${v}`);
     }
     args.push(entry.id, "--", entry.command, ...entry.args);
@@ -36143,9 +36341,9 @@ function installToClaude(entry) {
 }
 function installToCodex(entry) {
   try {
-    const configDir = join8(homedir8(), ".codex");
-    const configPath = join8(configDir, "config.toml");
-    if (!existsSync7(configDir)) {
+    const configDir = join9(homedir8(), ".codex");
+    const configPath = join9(configDir, "config.toml");
+    if (!existsSync8(configDir)) {
       mkdirSync7(configDir, { recursive: true });
     }
     const block = `
@@ -36153,7 +36351,7 @@ function installToCodex(entry) {
 ` + `command = ${JSON.stringify(entry.command)}
 ` + `args = [${entry.args.map((a) => JSON.stringify(a)).join(", ")}]
 `;
-    const existing = existsSync7(configPath) ? readFileSync3(configPath, "utf-8") : "";
+    const existing = existsSync8(configPath) ? readFileSync4(configPath, "utf-8") : "";
     if (existing.includes(`[mcp_servers.${entry.id}]`)) {
       return { agent: "codex", success: true };
     }
@@ -36165,21 +36363,22 @@ function installToCodex(entry) {
 }
 function installToGemini(entry) {
   try {
-    const configDir = join8(homedir8(), ".gemini");
-    const configPath = join8(configDir, "settings.json");
-    if (!existsSync7(configDir)) {
+    const configDir = join9(homedir8(), ".gemini");
+    const configPath = join9(configDir, "settings.json");
+    if (!existsSync8(configDir)) {
       mkdirSync7(configDir, { recursive: true });
     }
     let settings = {};
-    if (existsSync7(configPath)) {
-      settings = JSON.parse(readFileSync3(configPath, "utf-8"));
+    if (existsSync8(configPath)) {
+      settings = JSON.parse(readFileSync4(configPath, "utf-8"));
     }
     if (!settings.mcpServers)
       settings.mcpServers = {};
+    const env = assertAgentInstallEnv(entry);
     settings.mcpServers[entry.id] = {
       command: entry.command,
       args: entry.args,
-      ...Object.keys(entry.env).length > 0 ? { env: entry.env } : {}
+      ...Object.keys(env).length > 0 ? { env } : {}
     };
     writeFileSync3(configPath, JSON.stringify(settings, null, 2), "utf-8");
     return { agent: "gemini", success: true };
@@ -36187,12 +36386,24 @@ function installToGemini(entry) {
     return { agent: "gemini", success: false, error: err.message };
   }
 }
+function assertAgentInstallEnv(entry) {
+  const refs = entry.credentialRefs ?? {};
+  if (Object.keys(refs).length > 0) {
+    throw new CredentialReferenceError(`Server "${entry.id}" uses credential references; refusing to materialize secrets into local agent config files`);
+  }
+  for (const [key, value] of Object.entries(entry.env)) {
+    if (isSecretLikeEnvKey(key) || isSecretLikeValue(value)) {
+      throw new CredentialReferenceError(`Server "${entry.id}" has legacy raw secret-like env "${key}"; move it to a credential reference before installing to agents`);
+    }
+  }
+  return entry.env;
+}
 function installToAgents(entry, targets = ["claude", "codex", "gemini"], options = {}) {
   try {
     assertLocalCommandConsent({
       command: entry.command,
       args: entry.args,
-      env: entry.env,
+      env: { ...entry.env, ...credentialRefPlaceholders(entry.credentialRefs) },
       transport: entry.transport,
       operation: "install"
     }, options.localCommandConsent);
@@ -36203,6 +36414,15 @@ function installToAgents(entry, targets = ["claude", "codex", "gemini"], options
       error: err.message
     }));
   }
+  try {
+    assertAgentInstallEnv(entry);
+  } catch (err) {
+    return targets.map((target) => ({
+      agent: target,
+      success: false,
+      error: err.message
+    }));
+  }
   return targets.map((target) => {
     if (target === "claude")
       return installToClaude(entry);
@@ -36417,11 +36637,11 @@ function seedDefaultMachines() {
 // src/lib/fleet.ts
 init_config2();
 import { spawn as spawn2 } from "child_process";
-import { existsSync as existsSync8, mkdirSync as mkdirSync8, readFileSync as readFileSync4, writeFileSync as writeFileSync4 } from "fs";
-import { join as join9 } from "path";
+import { existsSync as existsSync9, mkdirSync as mkdirSync8, readFileSync as readFileSync5, writeFileSync as writeFileSync4 } from "fs";
+import { join as join10 } from "path";
 var NPM_SEARCH_URL = "https://registry.npmjs.org/-/v1/search";
 var NPM_REGISTRY_URL = "https://registry.npmjs.org";
-var CATALOG_CACHE_PATH = join9(MCPS_DIR, "cache", "hasna-catalog.json");
+var CATALOG_CACHE_PATH = join10(MCPS_DIR, "cache", "hasna-catalog.json");
 var DEFAULT_CATALOG_CACHE_TTL_MS = 60 * 60 * 1000;
 var DEFAULT_REMOTE_TIMEOUT_MS = 180000;
 var DEFAULT_HANDSHAKE_TIMEOUT_MS = 2500;
@@ -36431,9 +36651,9 @@ function normalizeQueryList(values) {
 }
 function readCatalogCache(maxAgeMs) {
   try {
-    if (!existsSync8(CATALOG_CACHE_PATH))
+    if (!existsSync9(CATALOG_CACHE_PATH))
       return null;
-    const parsed = JSON.parse(readFileSync4(CATALOG_CACHE_PATH, "utf-8"));
+    const parsed = JSON.parse(readFileSync5(CATALOG_CACHE_PATH, "utf-8"));
     if (!parsed.cachedAt || !Array.isArray(parsed.entries))
       return null;
     if (Date.now() - parsed.cachedAt > maxAgeMs)
@@ -36445,7 +36665,7 @@ function readCatalogCache(maxAgeMs) {
 }
 function writeCatalogCache(entries) {
   try {
-    mkdirSync8(join9(MCPS_DIR, "cache"), { recursive: true });
+    mkdirSync8(join10(MCPS_DIR, "cache"), { recursive: true });
     writeFileSync4(CATALOG_CACHE_PATH, JSON.stringify({ cachedAt: Date.now(), entries }, null, 2), "utf-8");
   } catch {}
 }
@@ -38449,22 +38669,22 @@ var EMPTY_COMPLETION_RESULT = {
 };
 
 // src/lib/version.ts
-import { existsSync as existsSync9, readFileSync as readFileSync5 } from "fs";
-import { dirname as dirname3, join as join10 } from "path";
+import { existsSync as existsSync10, readFileSync as readFileSync6 } from "fs";
+import { dirname as dirname3, join as join11 } from "path";
 import { fileURLToPath } from "url";
 var FALLBACK_VERSION = "0.0.1";
 function readPackageVersion(moduleUrl, fallback = FALLBACK_VERSION) {
   const baseDir = dirname3(fileURLToPath(moduleUrl));
   const candidates = [
-    join10(baseDir, "..", "..", "package.json"),
-    join10(baseDir, "..", "package.json"),
-    join10(baseDir, "package.json")
+    join11(baseDir, "..", "..", "package.json"),
+    join11(baseDir, "..", "package.json"),
+    join11(baseDir, "package.json")
   ];
   for (const candidate of candidates) {
-    if (!existsSync9(candidate))
+    if (!existsSync10(candidate))
       continue;
     try {
-      const pkg = JSON.parse(readFileSync5(candidate, "utf-8"));
+      const pkg = JSON.parse(readFileSync6(candidate, "utf-8"));
       if (pkg.version)
         return pkg.version;
     } catch {}
@@ -38497,6 +38717,9 @@ function localConsent(input) {
     source: "mcp"
   };
 }
+function readCredentialRefs(input) {
+  return normalizeCredentialRefs(input.credential_refs ?? input.credentialRefs);
+}
 function buildMcpTools() {
   const definitions = [
     {
@@ -38522,6 +38745,12 @@ function buildMcpTools() {
         transport: exports_external2.enum(["stdio", "sse", "streamable-http"]).optional().describe("Transport type"),
         url: exports_external2.string().optional().describe("URL for remote transports"),
         env: exports_external2.record(exports_external2.string()).optional().describe("Environment variables"),
+        credential_refs: exports_external2.record(exports_external2.object({
+          source: exports_external2.enum(["env", "local-vault", "hosted"]),
+          name: exports_external2.string(),
+          required: exports_external2.boolean().optional(),
+          description: exports_external2.string().optional()
+        })).optional().describe("Credential references by server env key"),
         allow_local_stdio: exports_external2.boolean().optional().describe("Approve registering this local stdio command"),
         allow_risky_command: exports_external2.boolean().optional().describe("Approve registering risky local command patterns")
       },
@@ -38529,9 +38758,16 @@ function buildMcpTools() {
         const command = String(input.command);
         const args = Array.isArray(input.args) ? input.args.map(String) : [];
         const env = isRecordOfStrings(input.env) ? input.env : {};
+        const credentialRefs = readCredentialRefs(input);
         const transport = input.transport;
         try {
-          assertLocalCommandConsent({ command, args, env, transport, operation: "register" }, localConsent(input));
+          assertLocalCommandConsent({
+            command,
+            args,
+            env: { ...env, ...Object.fromEntries(Object.keys(credentialRefs).map((key) => [key, "<credential-ref>"])) },
+            transport,
+            operation: "register"
+          }, localConsent(input));
           return jsonContent(addServer({
             command,
             args,
@@ -38539,7 +38775,8 @@ function buildMcpTools() {
             description: typeof input.description === "string" ? input.description : undefined,
             transport,
             url: typeof input.url === "string" ? input.url : undefined,
-            env
+            env,
+            credentialRefs
           }));
         } catch (err) {
           return errorContent(err.message);
@@ -38607,6 +38844,12 @@ function buildMcpTools() {
         args: exports_external2.array(exports_external2.string()).optional().describe("New args list"),
         transport: exports_external2.enum(["stdio", "sse", "streamable-http"]).optional().describe("New transport type"),
         url: exports_external2.string().optional().describe("New URL for remote transports"),
+        credential_refs: exports_external2.record(exports_external2.object({
+          source: exports_external2.enum(["env", "local-vault", "hosted"]),
+          name: exports_external2.string(),
+          required: exports_external2.boolean().optional(),
+          description: exports_external2.string().optional()
+        })).optional().describe("Credential references by server env key"),
         allow_local_stdio: exports_external2.boolean().optional().describe("Approve updating this local stdio command"),
         allow_risky_command: exports_external2.boolean().optional().describe("Approve risky local command patterns")
       },
@@ -38624,6 +38867,8 @@ function buildMcpTools() {
           fields.command = input.command;
         if (Array.isArray(input.args))
           fields.args = input.args.map(String);
+        if (input.credential_refs !== undefined || input.credentialRefs !== undefined)
+          fields.credentialRefs = readCredentialRefs(input);
         if (input.transport === "stdio" || input.transport === "sse" || input.transport === "streamable-http")
           fields.transport = input.transport;
         if (typeof input.url === "string")
@@ -38633,7 +38878,10 @@ function buildMcpTools() {
             assertLocalCommandConsent({
               command: fields.command ?? existing.command,
               args: fields.args ?? existing.args,
-              env: existing.env,
+              env: {
+                ...existing.env,
+                ...Object.fromEntries(Object.keys(fields.credentialRefs ?? existing.credentialRefs ?? {}).map((key) => [key, "<credential-ref>"]))
+              },
               transport: fields.transport ?? existing.transport,
               operation: "register"
             }, localConsent(input));
@@ -39197,32 +39445,32 @@ if (isDirectRun) {
 }
 
 // src/server/serve.ts
-import { existsSync as existsSync10 } from "fs";
-import { join as join11, dirname as dirname4, extname, resolve, relative as relative2, sep } from "path";
+import { existsSync as existsSync11 } from "fs";
+import { join as join12, dirname as dirname4, extname, resolve, relative as relative2, sep } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 init_sources();
 init_db();
 function redactServer(server) {
-  return { ...server, env: {} };
+  return { ...redactServerCredentials(server), env: {} };
 }
 function resolveDashboardDir() {
   const candidates = [];
   try {
     const scriptDir = dirname4(fileURLToPath2(import.meta.url));
-    candidates.push(join11(scriptDir, "..", "dashboard", "dist"));
-    candidates.push(join11(scriptDir, "..", "..", "dashboard", "dist"));
+    candidates.push(join12(scriptDir, "..", "dashboard", "dist"));
+    candidates.push(join12(scriptDir, "..", "..", "dashboard", "dist"));
   } catch {}
   if (process.argv[1]) {
     const mainDir = dirname4(process.argv[1]);
-    candidates.push(join11(mainDir, "..", "dashboard", "dist"));
-    candidates.push(join11(mainDir, "..", "..", "dashboard", "dist"));
+    candidates.push(join12(mainDir, "..", "dashboard", "dist"));
+    candidates.push(join12(mainDir, "..", "..", "dashboard", "dist"));
   }
-  candidates.push(join11(process.cwd(), "dashboard", "dist"));
+  candidates.push(join12(process.cwd(), "dashboard", "dist"));
   for (const candidate of candidates) {
-    if (existsSync10(candidate))
+    if (existsSync11(candidate))
       return candidate;
   }
-  return join11(process.cwd(), "dashboard", "dist");
+  return join12(process.cwd(), "dashboard", "dist");
 }
 var MIME_TYPES = {
   ".html": "text/html; charset=utf-8",
@@ -39324,7 +39572,7 @@ function getAllServersWithToolCount() {
   }));
 }
 function serveStaticFile(filePath) {
-  if (!existsSync10(filePath))
+  if (!existsSync11(filePath))
     return null;
   const ext = extname(filePath);
   const contentType = MIME_TYPES[ext] || "application/octet-stream";
@@ -39357,7 +39605,7 @@ async function startServer(port, options) {
   const host = options?.host ?? "127.0.0.1";
   getDb();
   const dashboardDir = resolveDashboardDir();
-  const dashboardExists = existsSync10(dashboardDir);
+  const dashboardExists = existsSync11(dashboardDir);
   if (!dashboardExists) {
     console.error(`
 Dashboard not found at: ${dashboardDir}`);
@@ -39416,8 +39664,16 @@ Dashboard not found at: ${dashboardDir}`);
             return json({ error: "Invalid 'args' format" }, 400, port);
           }
           const args = body.args || [];
+          const credentialRefs = normalizeCredentialRefs(body.credential_refs ?? body.credentialRefs);
+          const env = body.env && typeof body.env === "object" && !Array.isArray(body.env) ? body.env : {};
           try {
-            assertLocalCommandConsent({ command, args, env: {}, transport, operation: "register" }, consentFromInput(body));
+            assertLocalCommandConsent({
+              command,
+              args,
+              env: { ...env, ...Object.fromEntries(Object.keys(credentialRefs).map((key) => [key, "<credential-ref>"])) },
+              transport,
+              operation: "register"
+            }, consentFromInput(body));
           } catch (err) {
             return json({ error: err.message }, 400, port);
           }
@@ -39427,10 +39683,14 @@ Dashboard not found at: ${dashboardDir}`);
             args,
             description: body.description,
             transport,
-            url: body.url
+            url: body.url,
+            env,
+            credentialRefs
           });
           return json(entry, 200, port);
         } catch (e) {
+          if (e instanceof CredentialReferenceError)
+            return json({ error: e.message }, 400, port);
           return json({ error: e instanceof Error ? e.message : "Failed to add server" }, 500, port);
         }
       }
@@ -39509,6 +39769,11 @@ Dashboard not found at: ${dashboardDir}`);
             fields.description = body.description;
           if (body.command !== undefined)
             fields.command = body.command;
+          if (body.env !== undefined)
+            fields.env = body.env;
+          if (body.credential_refs !== undefined || body.credentialRefs !== undefined) {
+            fields.credentialRefs = normalizeCredentialRefs(body.credential_refs ?? body.credentialRefs);
+          }
           if (body.transport !== undefined)
             fields.transport = body.transport;
           if (body.url !== undefined)
@@ -39524,7 +39789,10 @@ Dashboard not found at: ${dashboardDir}`);
               assertLocalCommandConsent({
                 command: fields.command ?? existing.command,
                 args: fields.args ?? existing.args,
-                env: existing.env,
+                env: {
+                  ...fields.env ?? existing.env,
+                  ...Object.fromEntries(Object.keys(fields.credentialRefs ?? existing.credentialRefs ?? {}).map((key) => [key, "<credential-ref>"]))
+                },
                 transport: fields.transport ?? existing.transport,
                 operation: "register"
               }, consentFromInput(body));
@@ -39560,6 +39828,8 @@ Dashboard not found at: ${dashboardDir}`);
           setServerEnv(id, body.key, body.value);
           return json({ ok: true }, 200, port);
         } catch (e) {
+          if (e instanceof CredentialReferenceError)
+            return json({ error: e.message }, 400, port);
           return json({ error: e instanceof Error ? e.message : "Failed" }, 500, port);
         }
       }
@@ -39762,7 +40032,7 @@ Dashboard not found at: ${dashboardDir}`);
               return res2;
           }
         }
-        const indexPath = join11(dashboardDir, "index.html");
+        const indexPath = join12(dashboardDir, "index.html");
         const res = serveStaticFile(indexPath);
         if (res)
           return res;
@@ -40916,6 +41186,30 @@ function assertCliLocalCommandConsent(input, opts, approved = false) {
   assertLocalCommandConsent(input, consent);
   return consent;
 }
+function parseCredentialPairs(pairs, source) {
+  const refs = {};
+  for (const pair of pairs ?? []) {
+    const eqIdx = pair.indexOf("=");
+    if (eqIdx <= 0)
+      throw new Error(`Credential reference must use KEY=NAME format: ${pair}`);
+    const key = pair.slice(0, eqIdx).trim();
+    const name = pair.slice(eqIdx + 1).trim();
+    if (!key || !name)
+      throw new Error(`Credential reference must use KEY=NAME format: ${pair}`);
+    refs[key] = { source, name, required: true };
+  }
+  return refs;
+}
+function credentialRefsFromOptions(opts) {
+  return {
+    ...parseCredentialPairs(opts.credentialEnv, "env"),
+    ...parseCredentialPairs(opts.credentialLocal, "local-vault"),
+    ...parseCredentialPairs(opts.credentialHosted, "hosted")
+  };
+}
+function formatCredentialRef(ref) {
+  return `${ref.source}:${ref.name}`;
+}
 function printProviderProfile(profile) {
   const status = profile.enabled ? chalk2.green("enabled") : chalk2.red("disabled");
   console.log(`  ${chalk2.bold(profile.displayName)} ${chalk2.dim(`[${profile.id}]`)} \u2014 ${chalk2.dim(profile.transport)} \u2014 ${status}`);
@@ -41200,7 +41494,7 @@ function detectSourceType(url2) {
     return "mcp-registry";
   return null;
 }
-program2.command("add").passThroughOptions().argument("[command]", "Command to run the MCP server").argument("[args...]", "Arguments for the command").option("--name <name>", "Display name for the server").option("--description <desc>", "Description").option("--from-registry <id>", "Install from official registry by ID").option("--transport <type>", "Transport type: stdio, sse, streamable-http", "stdio").option("--url <url>", "URL for remote transports").option("--env <pairs...>", "Environment variables as KEY=VALUE pairs").option("--wizard", "Interactive setup wizard").option("--force", "Register even if duplicate command exists").option("--yes", "Approve registering local stdio commands").option("--allow-local-stdio", "Approve registering local stdio commands").option("--allow-risky-command", "Approve high-risk local command patterns").description("Add a local MCP server").action(async (command, args, opts) => {
+program2.command("add").passThroughOptions().argument("[command]", "Command to run the MCP server").argument("[args...]", "Arguments for the command").option("--name <name>", "Display name for the server").option("--description <desc>", "Description").option("--from-registry <id>", "Install from official registry by ID").option("--transport <type>", "Transport type: stdio, sse, streamable-http", "stdio").option("--url <url>", "URL for remote transports").option("--env <pairs...>", "Environment variables as KEY=VALUE pairs").option("--credential-env <pairs...>", "Credential refs as KEY=ENV_VAR pairs").option("--credential-local <pairs...>", "Credential refs as KEY=LOCAL_VAULT_NAME pairs").option("--credential-hosted <pairs...>", "Credential refs as KEY=HOSTED_CREDENTIAL_ID pairs").option("--wizard", "Interactive setup wizard").option("--force", "Register even if duplicate command exists").option("--yes", "Approve registering local stdio commands").option("--allow-local-stdio", "Approve registering local stdio commands").option("--allow-risky-command", "Approve high-risk local command patterns").description("Add a local MCP server").action(async (command, args, opts) => {
   try {
     if (opts.fromRegistry) {
       console.log(chalk2.dim(`Installing "${opts.fromRegistry}" from registry...`));
@@ -41277,7 +41571,8 @@ Server to add:`));
         name: wizardName || undefined,
         description: wizardDescription || undefined,
         transport,
-        env
+        env,
+        credentialRefs: credentialRefsFromOptions(opts)
       });
       console.log(chalk2.green(`Added: ${server2.name} [${server2.id}]`));
       closeDb();
@@ -41307,10 +41602,11 @@ Server to add:`));
         envMap[key] = rest.join("=");
       }
     }
+    const credentialRefs = credentialRefsFromOptions(opts);
     assertCliLocalCommandConsent({
       command,
       args,
-      env: envMap,
+      env: { ...envMap, ...Object.fromEntries(Object.keys(credentialRefs).map((key) => [key, "<credential-ref>"])) },
       transport: opts.transport,
       operation: "register"
     }, opts);
@@ -41321,7 +41617,8 @@ Server to add:`));
       args,
       transport: opts.transport,
       url: opts.url,
-      env: envMap
+      env: envMap,
+      credentialRefs
     });
     console.log(chalk2.green(`Added server: ${server.name} [${server.id}]`));
     console.log(chalk2.dim(`  ${server.command} ${server.args.join(" ")}`));
@@ -41520,20 +41817,24 @@ program2.command("info").argument("<id>", "Server ID").description("Show server
     closeDb();
     process.exit(1);
   }
-  console.log(chalk2.bold(server.name) + " " + chalk2.dim(`[${server.id}]`));
-  console.log(`  Status:    ${server.enabled ? chalk2.green("enabled") : chalk2.red("disabled")}`);
-  console.log(`  Source:    ${server.source}`);
-  console.log(`  Transport: ${server.transport}`);
-  console.log(`  Command:   ${server.command} ${server.args.join(" ")}`);
-  if (server.url)
-    console.log(`  URL:       ${server.url}`);
-  if (server.description)
-    console.log(`  Desc:      ${server.description}`);
-  if (Object.keys(server.env).length > 0) {
-    console.log(`  Env:       ${Object.entries(server.env).map(([k, v]) => `${k}=${v}`).join(", ")}`);
-  }
-  console.log(`  Created:   ${server.created_at}`);
-  console.log(`  Updated:   ${server.updated_at}`);
+  const safeServer = redactServerCredentials(server);
+  console.log(chalk2.bold(safeServer.name) + " " + chalk2.dim(`[${safeServer.id}]`));
+  console.log(`  Status:    ${safeServer.enabled ? chalk2.green("enabled") : chalk2.red("disabled")}`);
+  console.log(`  Source:    ${safeServer.source}`);
+  console.log(`  Transport: ${safeServer.transport}`);
+  console.log(`  Command:   ${safeServer.command} ${safeServer.args.join(" ")}`);
+  if (safeServer.url)
+    console.log(`  URL:       ${safeServer.url}`);
+  if (safeServer.description)
+    console.log(`  Desc:      ${safeServer.description}`);
+  if (Object.keys(safeServer.env).length > 0) {
+    console.log(`  Env:       ${Object.entries(safeServer.env).map(([k, v]) => `${k}=${v}`).join(", ")}`);
+  }
+  if (Object.keys(safeServer.credentialRefs ?? {}).length > 0) {
+    console.log(`  Cred refs: ${Object.entries(safeServer.credentialRefs ?? {}).map(([k, ref]) => `${k}=${formatCredentialRef(ref)}`).join(", ")}`);
+  }
+  console.log(`  Created:   ${safeServer.created_at}`);
+  console.log(`  Updated:   ${safeServer.updated_at}`);
   const cached2 = getCachedTools(id);
   if (cached2.length > 0) {
     console.log(chalk2.bold(`
@@ -42173,7 +42474,7 @@ fleetCmd.command("install").argument("[machineIds...]", "Optional machine IDs to
   }
 });
 program2.command("export").description("Export all servers and sources to a JSON file").option("--file <path>", "Output file path", `${process.env.HOME ?? "~"}/.hasna/mcps/export.json`).option("--stdout", "Write to stdout instead of a file").action((opts) => {
-  const servers = listServers();
+  const servers = listServers().map(redactServerCredentials);
   const sources = listSources();
   const payload = {
     version: 1,
@@ -42193,7 +42494,7 @@ program2.command("export").description("Export all servers and sources to a JSON
 program2.command("import").argument("<file>", "Path to the export JSON file").description("Import servers and sources from a JSON export file").option("--overwrite", "Overwrite existing entries with matching IDs").action((file, opts) => {
   let payload;
   try {
-    payload = JSON.parse(readFileSync6(file, "utf-8"));
+    payload = JSON.parse(readFileSync7(file, "utf-8"));
   } catch (err) {
     console.error(chalk2.red(`Failed to read file: ${err.message}`));
     closeDb();
@@ -42215,7 +42516,23 @@ program2.command("import").argument("<file>", "Path to the export JSON file").de
       serversSkipped++;
       continue;
     }
-    db2.run(`INSERT ${orReplace} INTO servers (id, name, description, command, args, env, transport, url, source, enabled, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)`, [s.id, s.name, s.description, s.command, JSON.stringify(s.args ?? []), JSON.stringify(s.env ?? {}), s.transport, s.url, s.source, s.enabled ? 1 : 0, s.created_at, s.updated_at]);
+    const literalEnv = normalizeLiteralEnv(s.env ?? {});
+    const credentialRefs = normalizeCredentialRefs(s.credentialRefs ?? s.credential_refs ?? {});
+    db2.run(`INSERT ${orReplace} INTO servers (id, name, description, command, args, env, credential_refs, transport, url, source, enabled, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)`, [
+      s.id,
+      s.name,
+      s.description,
+      s.command,
+      JSON.stringify(s.args ?? []),
+      JSON.stringify(literalEnv),
+      JSON.stringify(credentialRefs),
+      s.transport,
+      s.url,
+      s.source,
+      s.enabled ? 1 : 0,
+      s.created_at,
+      s.updated_at
+    ]);
     serversImported++;
   }
   let sourcesImported = 0;
@@ -42241,14 +42558,17 @@ envCmd.command("list").argument("<id>").description("List env vars for a server"
     closeDb();
     process.exit(1);
   }
-  const entries = Object.entries(server.env);
-  if (entries.length === 0) {
-    console.log(chalk2.dim("No env vars set."));
+  const envEntries = Object.entries(redactEnv(server.env));
+  const refEntries = Object.entries(server.credentialRefs ?? {});
+  if (envEntries.length === 0 && refEntries.length === 0) {
+    console.log(chalk2.dim("No env vars or credential refs set."));
     closeDb();
     return;
   }
-  for (const [k, v] of entries)
+  for (const [k, v] of envEntries)
     console.log(`  ${chalk2.bold(k)}=${chalk2.dim(v)}`);
+  for (const [k, ref] of refEntries)
+    console.log(`  ${chalk2.bold(k)}=${chalk2.dim(formatCredentialRef(ref))}`);
   closeDb();
 });
 envCmd.command("set").argument("<id>").argument("<pair>", "KEY=VALUE").description("Set an env var").action((id, pair) => {
@@ -42270,6 +42590,36 @@ envCmd.command("set").argument("<id>").argument("<pair>", "KEY=VALUE").descripti
   }
   closeDb();
 });
+envCmd.command("ref").argument("<id>").argument("<pair>", "KEY=NAME").description("Set a credential reference for a server env key").option("--source <source>", "Credential source: env, local-vault, hosted", "env").action((id, pair, opts) => {
+  const source = opts.source;
+  if (source !== "env" && source !== "local-vault" && source !== "hosted") {
+    console.error(chalk2.red("Source must be one of: env, local-vault, hosted"));
+    closeDb();
+    process.exit(1);
+  }
+  try {
+    const refs = parseCredentialPairs([pair], source);
+    const [key, ref] = Object.entries(refs)[0];
+    setServerCredentialRef(id, key, ref);
+    console.log(chalk2.green(`Set credential ref ${key}=${formatCredentialRef(ref)} on ${id}`));
+  } catch (err) {
+    console.error(chalk2.red(err.message));
+    closeDb();
+    process.exit(1);
+  }
+  closeDb();
+});
+envCmd.command("unset-ref").argument("<id>").argument("<key>").description("Remove a credential reference").action((id, key) => {
+  try {
+    unsetServerCredentialRef(id, key);
+    console.log(chalk2.green(`Unset credential ref ${key} on ${id}`));
+  } catch (err) {
+    console.error(chalk2.red(err.message));
+    closeDb();
+    process.exit(1);
+  }
+  closeDb();
+});
 envCmd.command("unset").argument("<id>").argument("<key>").description("Remove an env var").action((id, key) => {
   try {
     unsetServerEnv(id, key);