@kwonye/mcpx 0.1.74 → 0.1.75

package/dist/{cli-33pamqwn.js → cli-fh6jh7fs.js}

@@ -28,6 +28,9 @@ function getStateRoot() {
 function getConfigPath() {
   return path.join(getConfigRoot(), "mcpx", "config.json");
 }
+function getSkillsDir() {
+  return path.join(getConfigRoot(), "mcpx", "skills");
+}
 function getManagedIndexPath() {
   return path.join(getDataRoot(), "mcpx", "managed-index.json");
 }
@@ -216,10 +219,52 @@ function ensureGatewayToken(config, secrets) {
   return secrets.rotateLocalToken(secretName);
 }
 
+// src/core/skills.ts
+import fs3 from "node:fs";
+import path3 from "node:path";
+function listSkills() {
+  const skillsDir = getSkillsDir();
+  if (!fs3.existsSync(skillsDir)) {
+    return [];
+  }
+  const files = fs3.readdirSync(skillsDir);
+  const skills = [];
+  for (const file of files) {
+    if (file.endsWith(".md")) {
+      const id = path3.basename(file, ".md");
+      const content = fs3.readFileSync(path3.join(skillsDir, file), "utf-8");
+      skills.push({ id, content });
+    }
+  }
+  return skills;
+}
+function getSkill(id) {
+  const skillsDir = getSkillsDir();
+  const filePath = path3.join(skillsDir, `${id}.md`);
+  if (!fs3.existsSync(filePath)) {
+    return null;
+  }
+  const content = fs3.readFileSync(filePath, "utf-8");
+  return { id, content };
+}
+function saveSkill(id, content) {
+  const skillsDir = getSkillsDir();
+  ensureDir(skillsDir);
+  const filePath = path3.join(skillsDir, `${id}.md`);
+  fs3.writeFileSync(filePath, content, "utf-8");
+}
+function deleteSkill(id) {
+  const skillsDir = getSkillsDir();
+  const filePath = path3.join(skillsDir, `${id}.md`);
+  if (fs3.existsSync(filePath)) {
+    fs3.unlinkSync(filePath);
+  }
+}
+
 // src/core/secrets.ts
 import { execFileSync } from "node:child_process";
 import crypto2 from "node:crypto";
-import fs3 from "node:fs";
+import fs4 from "node:fs";
 function parseSecretRef(ref) {
   if (!ref.startsWith("secret://")) {
     return null;
@@ -313,7 +358,7 @@ function readSecretValueFromStdin() {
   if (process.stdin.isTTY) {
     throw new Error("No value provided. Use --value or pipe a value via stdin.");
   }
-  const content = fs3.readFileSync(process.stdin.fd, "utf8").trim();
+  const content = fs4.readFileSync(process.stdin.fd, "utf8").trim();
   if (content.length === 0) {
     throw new Error("Empty secret value provided.");
   }
@@ -372,7 +417,7 @@ async function probeHttpAuthRequirement(spec, secrets, timeoutMs = DEFAULT_AUTH_
 }
 
 // src/adapters/claude.ts
-import path3 from "node:path";
+import path4 from "node:path";
 import { z as z2 } from "zod";
 
 // src/adapters/utils/index.ts
@@ -390,6 +435,11 @@ function pruneStaleManagedEntries(managedIndex, clientId, servers, keepEntryName
       delete servers[name];
     }
   }
+  for (const name of Object.keys(servers)) {
+    if (!keep.has(name) && name.endsWith(" (mcpx)")) {
+      delete servers[name];
+    }
+  }
 }
 function ensureManagedEntryWritable(managedIndex, clientId, entryName, existingValue) {
   if (existingValue === undefined || existingValue === null) {
@@ -511,7 +561,7 @@ var claudeEntrySchema = z2.object({
 class ClaudeAdapter {
   id = "claude";
   detectConfigPath() {
-    return path3.join(homeDir(), ".claude.json");
+    return path4.join(homeDir(), ".claude.json");
   }
   supportsHttp() {
     return true;
@@ -623,7 +673,8 @@ class ClaudeAdapter {
 }
 
 // src/adapters/claude-desktop.ts
-import path4 from "node:path";
+import { execFileSync as execFileSync2 } from "node:child_process";
+import path5 from "node:path";
 import { z as z3 } from "zod";
 var stringMapSchema2 = z3.record(z3.string(), z3.string());
 var claudeDesktopEntrySchema = z3.object({
@@ -636,11 +687,20 @@ var claudeDesktopEntrySchema = z3.object({
   cwd: z3.string().min(1).optional(),
   disabled: z3.boolean().optional()
 }).passthrough();
+function buildProxyEntry(entry) {
+  const upstreamName = entry.name.replace(/ \(mcpx\)$/, "");
+  try {
+    const mcpxPath = execFileSync2("which", ["mcpx"], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }).trim();
+    if (mcpxPath)
+      return { command: mcpxPath, args: ["proxy", upstreamName] };
+  } catch {}
+  return { command: "npx", args: ["-y", "@kwonye/mcpx@latest", "proxy", upstreamName] };
+}
 
 class ClaudeDesktopAdapter {
   id = "claude-desktop";
   detectConfigPath() {
-    return path4.join(homeDir(), "Library", "Application Support", "Claude", "claude_desktop_config.json");
+    return path5.join(homeDir(), "Library", "Application Support", "Claude", "claude_desktop_config.json");
   }
   supportsHttp() {
     return true;
@@ -663,7 +723,7 @@ class ClaudeDesktopAdapter {
         continue;
       }
       const entry = parsed.data;
-      if ((entry.type === undefined || entry.type === "http") && entry.url && !entry.command) {
+      if ((entry.type === undefined || entry.type === "http" || entry.type === "streamable_http") && entry.url && !entry.command) {
         result.candidates.push({
           clientId: this.id,
           configPath,
@@ -707,11 +767,10 @@ class ClaudeDesktopAdapter {
     try {
       const raw = readJsonFile(configPath, {});
       const enabledEntries = options.managedEntries.filter((entry) => entry.enabled);
-      const serverEntries = Object.fromEntries(enabledEntries.map((entry) => [entry.name, {
-        type: "http",
-        url: entry.url,
-        headers: entry.headers
-      }]));
+      const serverEntries = Object.fromEntries(enabledEntries.map((entry) => {
+        const { command, args } = buildProxyEntry(entry);
+        return [entry.name, { command, args }];
+      }));
       const enabledManagedNames = enabledEntries.map((entry) => entry.name);
       const topLevelServers = raw.mcpServers ?? {};
       removeSourceEntries(topLevelServers, options.sourceEntriesToRemove);
@@ -727,10 +786,10 @@ class ClaudeDesktopAdapter {
       }
       raw.mcpServers = topLevelServers;
       writeJsonAtomic(configPath, raw);
-      setManagedEntries(options.managedIndex, this.id, configPath, Object.fromEntries(options.managedEntries.map((entry) => [
-        entry.name,
-        JSON.stringify({ type: "http", url: entry.url, headers: entry.headers, enabled: entry.enabled })
-      ])));
+      setManagedEntries(options.managedIndex, this.id, configPath, Object.fromEntries(options.managedEntries.map((entry) => {
+        const { command, args } = buildProxyEntry(entry);
+        return [entry.name, JSON.stringify({ command, args, enabled: entry.enabled })];
+      })));
       return okResult(this.id, configPath);
     } catch (error) {
       return errorResult(this.id, configPath, error.message);
@@ -739,8 +798,8 @@ class ClaudeDesktopAdapter {
 }
 
 // src/adapters/codex.ts
-import path5 from "node:path";
-import fs4 from "node:fs";
+import path6 from "node:path";
+import fs5 from "node:fs";
 import { parse, stringify } from "@iarna/toml";
 import { z as z4 } from "zod";
 var stringMapSchema3 = z4.preprocess((value) => {
@@ -763,7 +822,7 @@ var codexEntrySchema = z4.object({
 class CodexAdapter {
   id = "codex";
   detectConfigPath() {
-    return path5.join(homeDir(), ".codex", "config.toml");
+    return path6.join(homeDir(), ".codex", "config.toml");
   }
   supportsHttp() {
     return true;
@@ -771,10 +830,10 @@ class CodexAdapter {
   scanForImports(_config, managedIndex) {
     const configPath = this.detectConfigPath();
     const result = emptyImportScan(this.id, configPath ?? undefined);
-    if (!configPath || !fs4.existsSync(configPath)) {
+    if (!configPath || !fs5.existsSync(configPath)) {
       return result;
     }
-    const existing = fs4.readFileSync(configPath, "utf8");
+    const existing = fs5.readFileSync(configPath, "utf8");
     const doc = existing.trim().length > 0 ? parse(existing) : {};
     const mcpServers = doc.mcp_servers ?? {};
     for (const [name, rawEntry] of Object.entries(mcpServers)) {
@@ -829,7 +888,7 @@ class CodexAdapter {
       return errorResult(this.id, undefined, "Unable to resolve Codex config.toml path.");
     }
     try {
-      const existing = fs4.existsSync(configPath) ? fs4.readFileSync(configPath, "utf8") : "";
+      const existing = fs5.existsSync(configPath) ? fs5.readFileSync(configPath, "utf8") : "";
       const doc = existing.trim().length > 0 ? parse(existing) : {};
       const mcpServers = doc.mcp_servers ?? {};
       removeSourceEntries(mcpServers, options.sourceEntriesToRemove);
@@ -850,10 +909,10 @@ class CodexAdapter {
         mcpServers[name] = entry;
       }
       doc.mcp_servers = mcpServers;
-      fs4.mkdirSync(path5.dirname(configPath), { recursive: true });
+      fs5.mkdirSync(path6.dirname(configPath), { recursive: true });
       const tmpPath = `${configPath}.tmp-${process.pid}-${Date.now()}`;
-      fs4.writeFileSync(tmpPath, stringify(doc), { mode: 384 });
-      fs4.renameSync(tmpPath, configPath);
+      fs5.writeFileSync(tmpPath, stringify(doc), { mode: 384 });
+      fs5.renameSync(tmpPath, configPath);
       setManagedEntries(options.managedIndex, this.id, configPath, Object.fromEntries(Object.entries(serverEntries).map(([name, entry]) => [name, JSON.stringify(entry)])));
       return okResult(this.id, configPath);
     } catch (error) {
@@ -863,7 +922,7 @@ class CodexAdapter {
 }
 
 // src/adapters/cursor.ts
-import path6 from "node:path";
+import path7 from "node:path";
 import { z as z5 } from "zod";
 var stringMapSchema4 = z5.record(z5.string(), z5.string());
 var cursorEntrySchema = z5.object({
@@ -880,7 +939,7 @@ var cursorEntrySchema = z5.object({
 class CursorAdapter {
   id = "cursor";
   detectConfigPath() {
-    return path6.join(homeDir(), "Library", "Application Support", "Cursor", "User", "mcp.json");
+    return path7.join(homeDir(), "Library", "Application Support", "Cursor", "User", "mcp.json");
   }
   supportsHttp() {
     return true;
@@ -986,8 +1045,8 @@ class CursorAdapter {
 }
 
 // src/adapters/cline.ts
-import path7 from "node:path";
-import fs5 from "node:fs";
+import path8 from "node:path";
+import fs6 from "node:fs";
 import { z as z6 } from "zod";
 var stringMapSchema5 = z6.record(z6.string(), z6.string());
 var clineEntrySchema = z6.object({
@@ -1002,8 +1061,8 @@ var clineEntrySchema = z6.object({
 }).passthrough();
 function getCandidatePaths() {
   return [
-    path7.join(homeDir(), "Library", "Application Support", "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json"),
-    path7.join(homeDir(), "Library", "Application Support", "Cursor", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json")
+    path8.join(homeDir(), "Library", "Application Support", "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json"),
+    path8.join(homeDir(), "Library", "Application Support", "Cursor", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json")
   ];
 }
 
@@ -1012,7 +1071,7 @@ class ClineAdapter {
   detectConfigPath() {
     const candidates = getCandidatePaths();
     for (const candidate of candidates) {
-      if (fs5.existsSync(candidate)) {
+      if (fs6.existsSync(candidate)) {
         return candidate;
       }
     }
@@ -1024,7 +1083,7 @@ class ClineAdapter {
   scanForImports(_config, managedIndex) {
     const configPath = this.detectConfigPath();
     const result = emptyImportScan(this.id, configPath ?? undefined);
-    if (!configPath || !fs5.existsSync(configPath)) {
+    if (!configPath || !fs6.existsSync(configPath)) {
       return result;
     }
     const raw = readJsonFile(configPath, {});
@@ -1119,7 +1178,8 @@ class ClineAdapter {
 }
 
 // src/adapters/kiro.ts
-import path8 from "node:path";
+import fs7 from "node:fs";
+import path9 from "node:path";
 import { z as z7 } from "zod";
 var stringMapSchema6 = z7.record(z7.string(), z7.string());
 var kiroEntrySchema = z7.object({
@@ -1135,7 +1195,7 @@ var kiroEntrySchema = z7.object({
 class KiroAdapter {
   id = "kiro";
   detectConfigPath() {
-    return path8.join(homeDir(), ".kiro", "settings", "mcp.json");
+    return path9.join(homeDir(), ".kiro", "settings", "mcp.json");
   }
   supportsHttp() {
     return true;
@@ -1234,10 +1294,30 @@ class KiroAdapter {
       return errorResult(this.id, configPath, error.message);
     }
   }
+  syncSkills(skills) {
+    const skillsDir = path9.join(homeDir(), ".kiro", "skills");
+    if (!fs7.existsSync(skillsDir)) {
+      fs7.mkdirSync(skillsDir, { recursive: true });
+    }
+    const existingFiles = fs7.readdirSync(skillsDir);
+    const managedIds = new Set(skills.map((s) => s.id));
+    for (const file of existingFiles) {
+      if (file.endsWith(".md")) {
+        const id = path9.basename(file, ".md");
+        if (!managedIds.has(id)) {
+          fs7.unlinkSync(path9.join(skillsDir, file));
+        }
+      }
+    }
+    for (const skill of skills) {
+      const targetPath = path9.join(skillsDir, `${skill.id}.md`);
+      fs7.writeFileSync(targetPath, skill.content, "utf-8");
+    }
+  }
 }
 
 // src/adapters/opencode.ts
-import path9 from "node:path";
+import path10 from "node:path";
 import { z as z8 } from "zod";
 var stringMapSchema7 = z8.record(z8.string(), z8.string());
 var openCodeEntrySchema = z8.object({
@@ -1254,7 +1334,7 @@ var openCodeEntrySchema = z8.object({
 class OpenCodeAdapter {
   id = "opencode";
   detectConfigPath() {
-    return path9.join(homeDir(), ".config", "opencode", "opencode.json");
+    return path10.join(homeDir(), ".config", "opencode", "opencode.json");
   }
   supportsHttp() {
     return true;
@@ -1357,7 +1437,7 @@ class OpenCodeAdapter {
 }
 
 // src/adapters/vscode.ts
-import path10 from "node:path";
+import path11 from "node:path";
 import { z as z9 } from "zod";
 var stringMapSchema8 = z9.record(z9.string(), z9.string());
 var vscodeEntrySchema = z9.object({
@@ -1374,7 +1454,7 @@ var vscodeEntrySchema = z9.object({
 class VsCodeAdapter {
   id = "vscode";
   detectConfigPath() {
-    return path10.join(homeDir(), "Library", "Application Support", "Code", "User", "mcp.json");
+    return path11.join(homeDir(), "Library", "Application Support", "Code", "User", "mcp.json");
   }
   supportsHttp() {
     return true;
@@ -1480,7 +1560,8 @@ class VsCodeAdapter {
 }
 
 // src/adapters/qwen.ts
-import path11 from "node:path";
+import fs8 from "node:fs";
+import path12 from "node:path";
 import { z as z10 } from "zod";
 var stringMapSchema9 = z10.record(z10.string(), z10.string());
 var qwenEntrySchema = z10.object({
@@ -1496,7 +1577,7 @@ var qwenEntrySchema = z10.object({
 class QwenAdapter {
   id = "qwen";
   detectConfigPath() {
-    return path11.join(homeDir(), ".qwen", "settings.json");
+    return path12.join(homeDir(), ".qwen", "settings.json");
   }
   supportsHttp() {
     return true;
@@ -1592,6 +1673,26 @@ class QwenAdapter {
       return errorResult(this.id, configPath, error.message);
     }
   }
+  syncSkills(skills) {
+    const skillsDir = path12.join(homeDir(), ".qwen", "skills");
+    if (!fs8.existsSync(skillsDir)) {
+      fs8.mkdirSync(skillsDir, { recursive: true });
+    }
+    const existingFiles = fs8.readdirSync(skillsDir);
+    const managedIds = new Set(skills.map((s) => s.id));
+    for (const file of existingFiles) {
+      if (file.endsWith(".md")) {
+        const id = path12.basename(file, ".md");
+        if (!managedIds.has(id)) {
+          fs8.unlinkSync(path12.join(skillsDir, file));
+        }
+      }
+    }
+    for (const skill of skills) {
+      const targetPath = path12.join(skillsDir, `${skill.id}.md`);
+      fs8.writeFileSync(targetPath, skill.content, "utf-8");
+    }
+  }
 }
 
 // src/adapters/index.ts
@@ -1710,8 +1811,14 @@ function syncAllClients(config, secrets, targetClients) {
   const localToken = ensureGatewayToken(config, secrets);
   const gatewayUrl = getGatewayUrl(config);
   const managedEntries = buildManagedEntries(config, gatewayUrl, localToken);
+  const skills = listSkills();
   const results = [];
   for (const adapter of filteredAdapters) {
+    if (adapter.syncSkills) {
+      try {
+        adapter.syncSkills(skills);
+      } catch (error) {}
+    }
     if (!adapter.supportsHttp()) {
       results.push({
         clientId: adapter.id,
@@ -1857,12 +1964,12 @@ function maybePrefixBearer(target, value, raw = false) {
 }
 
 // src/version.ts
-var APP_VERSION = "0.1.74";
+var APP_VERSION = "0.1.75";
 
 // src/core/update.ts
-import fs6 from "node:fs";
-import path12 from "node:path";
-import { execFileSync as execFileSync2 } from "node:child_process";
+import fs9 from "node:fs";
+import path13 from "node:path";
+import { execFileSync as execFileSync3 } from "node:child_process";
 function compareVersions(a, b) {
   const partsA = a.split(".").map(Number);
   const partsB = b.split(".").map(Number);
@@ -1878,7 +1985,7 @@ function compareVersions(a, b) {
 }
 async function checkForUpdates() {
   try {
-    const output = execFileSync2("npm", ["view", "@kwonye/mcpx", "version"], {
+    const output = execFileSync3("npm", ["view", "@kwonye/mcpx", "version"], {
       encoding: "utf8",
       stdio: ["pipe", "pipe", "pipe"]
     }).trim();
@@ -1900,17 +2007,17 @@ async function checkForUpdates() {
 }
 function getStagedUpdate() {
   const stagedPath = getStagedVersionPath();
-  if (!fs6.existsSync(stagedPath)) {
+  if (!fs9.existsSync(stagedPath)) {
     return null;
   }
   try {
-    const raw = fs6.readFileSync(stagedPath, "utf8");
+    const raw = fs9.readFileSync(stagedPath, "utf8");
     const info = JSON.parse(raw);
     if (!info.version || !info.cliPath) {
       return null;
     }
-    const absoluteCliPath = path12.isAbsolute(info.cliPath) ? info.cliPath : path12.join(getUpdatesDir(), info.cliPath);
-    if (!fs6.existsSync(absoluteCliPath)) {
+    const absoluteCliPath = path13.isAbsolute(info.cliPath) ? info.cliPath : path13.join(getUpdatesDir(), info.cliPath);
+    if (!fs9.existsSync(absoluteCliPath)) {
       return null;
     }
     return {
@@ -1926,15 +2033,15 @@ function stageUpdate(version, cliPath) {
   ensureDir(updatesDir);
   const stagedInfo = {
     version,
-    cliPath: path12.isAbsolute(cliPath) ? path12.relative(updatesDir, cliPath) : cliPath,
+    cliPath: path13.isAbsolute(cliPath) ? path13.relative(updatesDir, cliPath) : cliPath,
     stagedAt: new Date().toISOString()
   };
-  fs6.writeFileSync(getStagedVersionPath(), JSON.stringify(stagedInfo, null, 2), "utf8");
+  fs9.writeFileSync(getStagedVersionPath(), JSON.stringify(stagedInfo, null, 2), "utf8");
 }
 function clearStagedUpdate() {
   const stagedPath = getStagedVersionPath();
-  if (fs6.existsSync(stagedPath)) {
-    fs6.unlinkSync(stagedPath);
+  if (fs9.existsSync(stagedPath)) {
+    fs9.unlinkSync(stagedPath);
   }
 }
 function getStagedCliPath() {
@@ -1943,31 +2050,31 @@ function getStagedCliPath() {
 }
 function removeOldVersions(keepCount = 2) {
   const updatesDir = getUpdatesDir();
-  if (!fs6.existsSync(updatesDir)) {
+  if (!fs9.existsSync(updatesDir)) {
     return;
   }
-  const entries = fs6.readdirSync(updatesDir, { withFileTypes: true });
+  const entries = fs9.readdirSync(updatesDir, { withFileTypes: true });
   const versionDirs = entries.filter((entry) => entry.isDirectory() && entry.name.startsWith("v")).map((entry) => entry.name).sort((a, b) => compareVersions(b.slice(1), a.slice(1)));
   if (versionDirs.length <= keepCount) {
     return;
   }
   for (const oldVersion of versionDirs.slice(keepCount)) {
-    const oldPath = path12.join(updatesDir, oldVersion);
+    const oldPath = path13.join(updatesDir, oldVersion);
     try {
-      fs6.rmSync(oldPath, { recursive: true, force: true });
+      fs9.rmSync(oldPath, { recursive: true, force: true });
     } catch {}
   }
 }
 
 // src/core/update-manager.ts
-import fs7 from "node:fs";
-import path13 from "node:path";
+import fs10 from "node:fs";
+import path14 from "node:path";
 import { execSync, spawn } from "node:child_process";
 function acquireLock() {
   const lockPath = getUpdateLockPath();
   try {
-    ensureDir(path13.dirname(lockPath));
-    fs7.writeFileSync(lockPath, `${process.pid}
+    ensureDir(path14.dirname(lockPath));
+    fs10.writeFileSync(lockPath, `${process.pid}
 `, { flag: "wx" });
     return true;
   } catch {
@@ -1977,25 +2084,25 @@ function acquireLock() {
 function releaseLock() {
   const lockPath = getUpdateLockPath();
   try {
-    fs7.unlinkSync(lockPath);
+    fs10.unlinkSync(lockPath);
   } catch {}
 }
 function isUpdateInProgress() {
   const lockPath = getUpdateLockPath();
-  if (!fs7.existsSync(lockPath)) {
+  if (!fs10.existsSync(lockPath)) {
     return false;
   }
   try {
-    const raw = fs7.readFileSync(lockPath, "utf8").trim();
+    const raw = fs10.readFileSync(lockPath, "utf8").trim();
     const pid = Number(raw);
     if (!Number.isFinite(pid) || pid <= 0) {
-      fs7.unlinkSync(lockPath);
+      fs10.unlinkSync(lockPath);
       return false;
     }
     process.kill(pid, 0);
     return true;
   } catch {
-    fs7.unlinkSync(lockPath);
+    fs10.unlinkSync(lockPath);
     return false;
   }
 }
@@ -2006,8 +2113,8 @@ async function downloadAndStageUpdate() {
   }
   const targetVersion = updateStatus.latestVersion;
   const updatesDir = getUpdatesDir();
-  const versionDir = path13.join(updatesDir, `v${targetVersion}`);
-  if (fs7.existsSync(versionDir)) {
+  const versionDir = path14.join(updatesDir, `v${targetVersion}`);
+  if (fs10.existsSync(versionDir)) {
     const existingStaged = getStagedUpdate();
     if (existingStaged?.version === targetVersion) {
       return { success: false, error: `Version ${targetVersion} already staged` };
@@ -2019,8 +2126,8 @@ async function downloadAndStageUpdate() {
       cwd: versionDir,
       stdio: ["pipe", "pipe", "pipe"]
     });
-    const tarballPath = path13.join(versionDir, `kwonye-mcpx-${targetVersion}.tgz`);
-    if (!fs7.existsSync(tarballPath)) {
+    const tarballPath = path14.join(versionDir, `kwonye-mcpx-${targetVersion}.tgz`);
+    if (!fs10.existsSync(tarballPath)) {
       throw new Error("Downloaded tarball not found");
     }
     execSync(`tar -xzf ${tarballPath} --strip-components=1`, {
@@ -2031,8 +2138,8 @@ async function downloadAndStageUpdate() {
       cwd: versionDir,
       stdio: ["pipe", "pipe", "pipe"]
     });
-    const cliPath = path13.join(versionDir, "dist", "cli.js");
-    if (!fs7.existsSync(cliPath)) {
+    const cliPath = path14.join(versionDir, "dist", "cli.js");
+    if (!fs10.existsSync(cliPath)) {
       throw new Error("CLI entry point not found in downloaded package");
     }
     stageUpdate(targetVersion, cliPath);
@@ -2040,7 +2147,7 @@ async function downloadAndStageUpdate() {
     return { success: true, version: targetVersion };
   } catch (error) {
     try {
-      fs7.rmSync(versionDir, { recursive: true, force: true });
+      fs10.rmSync(versionDir, { recursive: true, force: true });
     } catch {}
     return {
       success: false,
@@ -2118,7 +2225,7 @@ function performRollback() {
 }
 
 // src/core/daemon.ts
-import fs8 from "node:fs";
+import fs11 from "node:fs";
 import net from "node:net";
 import { spawn as spawn2 } from "node:child_process";
 
@@ -3064,10 +3171,10 @@ function createGatewayServer(options) {
 
 // src/core/daemon.ts
 function readPidFromFile(pidPath = getPidPath()) {
-  if (!fs8.existsSync(pidPath)) {
+  if (!fs11.existsSync(pidPath)) {
     return null;
   }
-  const raw = fs8.readFileSync(pidPath, "utf8").trim();
+  const raw = fs11.readFileSync(pidPath, "utf8").trim();
   if (!raw) {
     return null;
   }
@@ -3136,12 +3243,18 @@ function getDaemonStatus(config) {
 async function startDaemon(config, cliPath, secrets) {
   const existingStatus = getDaemonStatus(config);
   if (existingStatus.running && existingStatus.pid) {
-    return {
-      started: false,
-      pid: existingStatus.pid,
-      port: config.gateway.port,
-      message: "mcpx daemon already running."
-    };
+    const portAvailable = await isPortAvailable(config.gateway.port);
+    if (!portAvailable) {
+      return {
+        started: false,
+        pid: existingStatus.pid,
+        port: config.gateway.port,
+        message: "mcpx daemon already running."
+      };
+    }
+    try {
+      fs11.unlinkSync(getPidPath());
+    } catch {}
   }
   const port = await resolveGatewayPort(config);
   ensureGatewayToken(config, secrets);
@@ -3149,7 +3262,7 @@ async function startDaemon(config, cliPath, secrets) {
   const logPath = getLogPath();
   ensureParentDir(pidPath);
   ensureParentDir(logPath);
-  const logFd = fs8.openSync(logPath, "a", 384);
+  const logFd = fs11.openSync(logPath, "a", 384);
   const child = spawn2(process.execPath, [cliPath, "daemon", "run", "--port", String(port)], {
     detached: true,
     stdio: ["ignore", logFd, logFd],
@@ -3159,7 +3272,7 @@ async function startDaemon(config, cliPath, secrets) {
     }
   });
   child.unref();
-  fs8.writeFileSync(pidPath, `${child.pid}
+  fs11.writeFileSync(pidPath, `${child.pid}
 `, { mode: 384 });
   startBackgroundUpdateCheck();
   return {
@@ -3182,7 +3295,7 @@ function stopDaemon() {
     process.kill(pid, "SIGTERM");
   } catch {}
   try {
-    fs8.unlinkSync(pidPath);
+    fs11.unlinkSync(pidPath);
   } catch {}
   return {
     stopped: true,
@@ -3195,10 +3308,10 @@ async function restartDaemon(config, cliPath, secrets) {
 }
 function readDaemonLogs(maxLines = 200) {
   const logPath = getLogPath();
-  if (!fs8.existsSync(logPath)) {
+  if (!fs11.existsSync(logPath)) {
     return "";
   }
-  const lines = fs8.readFileSync(logPath, "utf8").split(`
+  const lines = fs11.readFileSync(logPath, "utf8").split(`
 `);
   return lines.slice(Math.max(lines.length - maxLines, 0)).join(`
 `);
@@ -3289,4 +3402,4 @@ function buildStatusReport(config, managedIndex, daemon = getDaemonStatus(config
   };
 }
 
-export { getConfigPath, getManagedIndexPath, defaultConfig, loadConfig, saveConfig, addServer, removeServer, updateServer, setServerEnabled, SecretsManager, readSecretValueFromStdin, probeHttpAuthRequirement, getAdapters, loadManagedIndex, getGatewayUrl, syncAllClients, toSecretRef, secretRefName, defaultAuthSecretName, resolveAuthTarget, applyAuthReference, removeAuthReference, listAuthBindings, maybePrefixBearer, APP_VERSION, compareVersions, checkForUpdates, getStagedUpdate, clearStagedUpdate, getStagedCliPath, startBackgroundUpdateCheck, runBackgroundUpdate, performUpdate, performRollback, getDaemonStatus, startDaemon, stopDaemon, restartDaemon, readDaemonLogs, runDaemonForeground, STATUS_CLIENTS, buildStatusReport };
+export { getConfigPath, getManagedIndexPath, defaultConfig, loadConfig, saveConfig, addServer, removeServer, updateServer, setServerEnabled, ensureGatewayToken, listSkills, getSkill, saveSkill, deleteSkill, SecretsManager, readSecretValueFromStdin, probeHttpAuthRequirement, getAdapters, loadManagedIndex, getGatewayUrl, syncAllClients, toSecretRef, secretRefName, defaultAuthSecretName, resolveAuthTarget, applyAuthReference, removeAuthReference, listAuthBindings, maybePrefixBearer, APP_VERSION, compareVersions, checkForUpdates, getStagedUpdate, clearStagedUpdate, getStagedCliPath, startBackgroundUpdateCheck, runBackgroundUpdate, performUpdate, performRollback, getDaemonStatus, startDaemon, stopDaemon, restartDaemon, readDaemonLogs, runDaemonForeground, STATUS_CLIENTS, buildStatusReport };