@pharaoh-so/mcp 0.2.4 → 0.2.6

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
 	"name": "pharaoh",
-	"version": "0.2.0",
+	"version": "0.2.3",
 	"description": "Codebase knowledge graph with 23 development workflow skills. Query architecture, dependencies, blast radius, and more instead of reading files one at a time.",
 	"author": {
 		"name": "Pharaoh",

package/dist/helpers.js

@@ -40,7 +40,7 @@ export function parseArgs(argv = process.argv.slice(2)) {
     return { server, logout };
 }
 export function printUsage() {
-    printLines("Usage: pharaoh-mcp [options]", "", "Options:", "  --server <url>    Pharaoh server URL (default: https://mcp.pharaoh.so)", "  --logout          Clear stored credentials and exit", "  --install-skills  Install Pharaoh skills to OpenClaw (~/.openclaw/skills/)", "  --help, -h        Show this help", "", "Add to Claude Code:", "  claude mcp add pharaoh -- npx @pharaoh-so/mcp", "");
+    printLines("Usage: pharaoh-mcp [options]", "", "Options:", "  --server <url>    Pharaoh server URL (default: https://mcp.pharaoh.so)", "  --logout          Clear stored credentials and exit", "  --install-skills  Force reinstall Pharaoh skills (Claude Code + OpenClaw)", "  --help, -h        Show this help", "", "Add to Claude Code:", "  claude mcp add pharaoh -- npx @pharaoh-so/mcp", "");
 }
 /**
  * Validate that a server-supplied SSE URL shares the same origin as the configured server.

package/dist/index.js

@@ -10,10 +10,11 @@
  * - Interactive (TTY): authenticate, print setup instructions, exit.
  * - Proxy (pipe):      require pre-existing credentials, bridge stdio ↔ SSE.
  */
-import { printActivationPrompt, printAuthSuccess, pollForToken, requestDeviceCode, } from "./auth.js";
+import { pollForToken, printActivationPrompt, printAuthSuccess, requestDeviceCode, } from "./auth.js";
 import { deleteCredentials, isExpired, readCredentials, writeCredentials } from "./credentials.js";
 import { formatIdentity, formatTtl, parseArgs, printLines, printSetupInstructions, printUsage, resolveSseUrl, tokenToCredentials, } from "./helpers.js";
-import { TokenExpiredError, TenantSuspendedError, startProxy } from "./proxy.js";
+import { runInstallSkills } from "./install-skills.js";
+import { startProxy, TenantSuspendedError, TokenExpiredError } from "./proxy.js";
 async function main() {
     const args = process.argv.slice(2);
     if (args.includes("--help") || args.includes("-h")) {
@@ -46,6 +47,8 @@ async function main() {
     if (isInteractive) {
         if (creds && !isExpired(creds)) {
             printLines(`Pharaoh: authenticated as ${formatIdentity(creds)} — token valid for ${formatTtl(creds.expires_at)}, ${creds.repos.length} repo${creds.repos.length === 1 ? "" : "s"} connected`);
+            // Ensure skills are installed/up-to-date on every interactive run
+            runInstallSkills();
             printSetupInstructions();
             process.exit(0);
         }
@@ -61,6 +64,8 @@ async function main() {
         const newCreds = tokenToCredentials(token, sseUrl);
         writeCredentials(newCreds);
         printAuthSuccess(token.github_login ?? null, token.tenant_name ?? null, token.repos?.length ?? 0);
+        // Auto-install skills to detected platforms (Claude Code, OpenClaw)
+        runInstallSkills();
         printSetupInstructions();
         process.exit(0);
     }
@@ -70,7 +75,14 @@ async function main() {
         printLines("Pharaoh: no valid credentials — cannot start proxy.", "Run this command first to authenticate:", "  npx @pharaoh-so/mcp", "");
         process.exit(1);
     }
-    // Valid credentials — start the proxy
+    // Valid credentials — ensure skills are installed before starting proxy
+    // Silently installs/updates on first run or package update; fast no-op if current.
+    try {
+        runInstallSkills();
+    }
+    catch {
+        // ALLOWED-CATCH: skill install failure must not block MCP proxy startup
+    }
     printLines(`Pharaoh: token valid for ${formatTtl(creds.expires_at)} — connecting`);
     try {
         await startProxy(creds.sse_url, creds.access_token);

package/dist/inspect.js

@@ -14,6 +14,17 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 const INSPECT_MSG = "This is Pharaoh's inspection server for directory listings. " +
     "Connect to https://mcp.pharaoh.so for actual usage.";
+/** Read version from package.json (single source of truth). */
+function getPackageVersion() {
+    try {
+        const pkgPath = join(import.meta.dirname, "..", "package.json");
+        const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
+        return pkg.version ?? "0.0.0";
+    }
+    catch {
+        return "0.0.0";
+    }
+}
 export async function runInspect() {
     // Load pre-generated schemas (shipped in the npm package)
     const schemasPath = join(import.meta.dirname, "..", "inspect-tools.json");
@@ -25,7 +36,7 @@ export async function runInspect() {
         process.stderr.write("Pharaoh: inspect-tools.json not found — rebuild the package.\n");
         process.exit(1);
     }
-    const server = new McpServer({ name: "pharaoh", version: "0.1.0" }, {
+    const server = new McpServer({ name: "pharaoh", version: getPackageVersion() }, {
         instructions: "Pharaoh turns codebases into knowledge graphs that AI agents can think with. " +
             "Connect at https://mcp.pharaoh.so for full functionality.",
     });

package/dist/install-skills.js

@@ -14,6 +14,16 @@ const __dirname = dirname(fileURLToPath(import.meta.url));
 const PKG_ROOT = join(__dirname, "..");
 /** Path to the bundled skills directory. */
 const BUNDLED_SKILLS_DIR = join(PKG_ROOT, "skills");
+/** Read the package version from package.json (single source of truth). */
+function getPackageVersion() {
+    try {
+        const pkg = JSON.parse(readFileSync(join(PKG_ROOT, "package.json"), "utf-8"));
+        return pkg.version ?? "0.0.0";
+    }
+    catch {
+        return "0.0.0";
+    }
+}
 // ── Detection ───────────────────────────────────────────────────────
 /**
  * Detect whether Claude Code is installed by checking for ~/.claude/.
@@ -59,50 +69,75 @@ function installClaudeCodePlugin(home = homedir()) {
         return -1;
     }
     // Copy skills/
+    let skillCount = 0;
     if (existsSync(BUNDLED_SKILLS_DIR)) {
         cpSync(BUNDLED_SKILLS_DIR, join(pluginDir, "skills"), { recursive: true, force: true });
+        const entries = readdirSync(BUNDLED_SKILLS_DIR, { withFileTypes: true });
+        skillCount = entries.filter((e) => e.isDirectory()).length;
     }
     // Copy .mcp.json
     const mcpSrc = join(PKG_ROOT, ".mcp.json");
     if (existsSync(mcpSrc)) {
         cpSync(mcpSrc, join(pluginDir, ".mcp.json"), { force: true });
     }
-    // Count installed skills
-    const entries = readdirSync(BUNDLED_SKILLS_DIR, { withFileTypes: true });
-    return entries.filter((e) => e.isDirectory()).length;
+    return skillCount;
 }
 /**
- * Register Pharaoh in Claude Code's installed_plugins.json.
- * Does NOT overwrite an existing entry.
+ * Register Pharaoh in Claude Code's installed_plugins.json (v2 format).
+ * Adds a new entry or updates the version/lastUpdated of an existing one.
+ * Preserves all other plugin entries.
  *
  * @param home - Home directory override (defaults to os.homedir()).
- * @returns True if the entry was added, false if already present.
+ * @returns "added" if new entry created, "updated" if version bumped, "current" if already up-to-date, "error" on failure.
  */
 function registerClaudeCodePlugin(home = homedir()) {
     const registryPath = join(home, ".claude", "plugins", "installed_plugins.json");
     const pluginKey = "pharaoh@pharaoh-so";
-    let registry = {};
+    const pluginDir = join(home, ".claude", "plugins", "data", "pharaoh");
+    const version = getPackageVersion();
+    const now = new Date().toISOString();
+    let registry = { version: 2, plugins: {} };
     if (existsSync(registryPath)) {
         try {
-            registry = JSON.parse(readFileSync(registryPath, "utf-8"));
+            const raw = JSON.parse(readFileSync(registryPath, "utf-8"));
+            // Handle both v2 format (with plugins key) and any other shape
+            if (raw.version === 2 && raw.plugins && typeof raw.plugins === "object") {
+                registry = raw;
+            }
+            else {
+                // Non-v2 file — preserve as-is, add v2 structure around it
+                registry = { version: 2, plugins: {}, ...raw };
+                if (!registry.plugins)
+                    registry.plugins = {};
+            }
         }
         catch {
             process.stderr.write("Pharaoh: installed_plugins.json exists but is not valid JSON — skipping registration.\n");
-            return false;
+            return "error";
         }
     }
-    if (registry[pluginKey]) {
-        return false;
-    }
-    registry[pluginKey] = {
-        name: "pharaoh",
-        version: "0.2.0",
-        source: "npm:@pharaoh-so/mcp",
-        pluginRoot: join(home, ".claude", "plugins", "data", "pharaoh"),
-        installedAt: new Date().toISOString(),
+    const existing = registry.plugins[pluginKey];
+    const entry = {
+        scope: "user",
+        installPath: pluginDir,
+        version,
+        installedAt: now,
+        lastUpdated: now,
     };
+    if (existing && existing.length > 0) {
+        const current = existing[0];
+        if (current.version === version) {
+            return "current";
+        }
+        // Version changed — update in place, preserve original installedAt
+        entry.installedAt = current.installedAt || now;
+        registry.plugins[pluginKey] = [entry];
+        writeFileSync(registryPath, JSON.stringify(registry, null, "\t"));
+        return "updated";
+    }
+    registry.plugins[pluginKey] = [entry];
     writeFileSync(registryPath, JSON.stringify(registry, null, "\t"));
-    return true;
+    return "added";
 }
 // ── OpenClaw installer ──────────────────────────────────────────────
 /**
@@ -181,17 +216,19 @@ export function runInstallSkills(home = homedir()) {
     if (hasClaudeCode) {
         const count = installClaudeCodePlugin(home);
         if (count >= 0) {
-            const registered = registerClaudeCodePlugin(home);
-            const regMsg = registered
-                ? "Plugin registered in installed_plugins.json"
-                : "Plugin already registered — skipped";
+            const regResult = registerClaudeCodePlugin(home);
+            const regMessages = {
+                added: "Plugin registered in installed_plugins.json",
+                updated: "Plugin version updated in installed_plugins.json",
+                current: "Plugin already registered and up-to-date",
+                error: "Could not update installed_plugins.json",
+            };
             process.stderr.write([
                 `Pharaoh: installed ${count} skills as Claude Code plugin`,
                 `  → ~/.claude/plugins/data/pharaoh/`,
-                `  → ${regMsg}`,
-                "",
-                "Restart Claude Code to pick up the new skills.",
+                `  → ${regMessages[regResult]}`,
                 "",
+                ...(regResult === "added" ? ["Restart Claude Code to pick up the new skills.", ""] : []),
             ].join("\n"));
             installed = true;
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pharaoh-so/mcp",
   "mcpName": "so.pharaoh/pharaoh",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "MCP proxy for Pharaoh — maps codebases into queryable knowledge graphs for AI agents. Enables Claude Code in headless environments (VPS, SSH, CI) via device flow auth.",
   "type": "module",
   "main": "dist/index.js",