typegraph-mcp 0.9.35 → 0.9.37

package/cli.ts

@@ -41,6 +41,12 @@ interface LegacyGlobalCodexCleanup {
   nextContent: string;
 }
 
+interface RemovePluginOptions {
+  removeGlobalCodex: boolean;
+  legacyGlobalCodexCleanup: LegacyGlobalCodexCleanup | null;
+  warnAboutGlobalCodex: boolean;
+}
+
 // ─── Constants ───────────────────────────────────────────────────────────────
 
 const AGENT_SNIPPET = `
@@ -68,6 +74,7 @@ Practical rule:
 `.trimStart();
 
 const SNIPPET_MARKER = "## TypeScript Navigation (typegraph-mcp)";
+const CLAUDE_NODE_PLACEHOLDER = "__TYPEGRAPH_NODE__";
 
 const PLUGIN_DIR_NAME = "plugins/typegraph-mcp";
 
@@ -145,6 +152,14 @@ const SKILL_FILES = [
   "skills/deep-survey/SKILL.md",
 ];
 
+const CLAUDE_TEMPLATE_FILES = new Set([
+  "commands/check.md",
+  "commands/test.md",
+  "commands/bench.md",
+  "commands/deep-survey.md",
+  "skills/deep-survey/SKILL.md",
+]);
+
 
 const SKILL_NAMES = [
   "tool-selection",
@@ -413,6 +428,41 @@ function removeLegacyGlobalCodexMcp(cleanup: LegacyGlobalCodexCleanup): void {
   p.log.info("~/.codex/config.toml: removed stale global typegraph MCP server entry for this project");
 }
 
+async function resolveRemovePluginOptions(
+  projectRoot: string,
+  yes: boolean,
+  cleanGlobalCodex: boolean
+): Promise<RemovePluginOptions> {
+  const legacyGlobalCodexCleanup = findLegacyGlobalCodexCleanup(projectRoot);
+  let removeGlobalCodex = cleanGlobalCodex;
+
+  if (legacyGlobalCodexCleanup && !cleanGlobalCodex && !yes) {
+    const shouldRemoveGlobal = await p.confirm({
+      message: "Also remove the stale global Codex MCP entry for this project from ~/.codex/config.toml?",
+      initialValue: false,
+    });
+    if (p.isCancel(shouldRemoveGlobal)) {
+      p.cancel("Removal cancelled.");
+      process.exit(0);
+    }
+    removeGlobalCodex = shouldRemoveGlobal;
+  }
+
+  return {
+    removeGlobalCodex,
+    legacyGlobalCodexCleanup,
+    warnAboutGlobalCodex: legacyGlobalCodexCleanup !== null && !removeGlobalCodex,
+  };
+}
+
+function warnAboutStaleGlobalCodex(): void {
+  p.log.warn(
+    "Left a stale global Codex MCP entry for this project in ~/.codex/config.toml. " +
+    "Codex may show MCP startup warnings or errors until you remove it. " +
+    "Re-run `typegraph-mcp remove --clean-global-codex` or remove the `typegraph` block manually."
+  );
+}
+
 /** Register the typegraph MCP server in agent-specific config files */
 function registerMcpServers(projectRoot: string, selectedAgents: AgentId[]): void {
   if (selectedAgents.includes("cursor")) {
@@ -724,7 +774,11 @@ async function setup(yes: boolean): Promise<void> {
     }
 
     if (action === "remove") {
-      await removePlugin(projectRoot, targetDir);
+      const removeOptions = await resolveRemovePluginOptions(projectRoot, false, false);
+      await removePlugin(projectRoot, targetDir, removeOptions);
+      if (removeOptions.warnAboutGlobalCodex) {
+        warnAboutStaleGlobalCodex();
+      }
       return;
     }
 
@@ -765,7 +819,14 @@ async function setup(yes: boolean): Promise<void> {
     const src = path.join(sourceDir, file);
     const dest = path.join(targetDir, file);
     if (fs.existsSync(src)) {
-      copyFile(src, dest);
+      if (selectedAgents.includes("claude-code") && CLAUDE_TEMPLATE_FILES.has(file)) {
+        const content = fs.readFileSync(src, "utf-8")
+          .replaceAll(CLAUDE_NODE_PLACEHOLDER, process.execPath);
+        fs.mkdirSync(path.dirname(dest), { recursive: true });
+        fs.writeFileSync(dest, content);
+      } else {
+        copyFile(src, dest);
+      }
       copied++;
     } else {
       p.log.warn(`Source file not found: ${file}`);
@@ -777,8 +838,8 @@ async function setup(yes: boolean): Promise<void> {
     const mcpConfig = {
       mcpServers: {
         typegraph: {
-          command: "npx",
-          args: ["tsx", "${CLAUDE_PLUGIN_ROOT}/server.ts"],
+          command: process.execPath,
+          args: ["${CLAUDE_PLUGIN_ROOT}/node_modules/tsx/dist/cli.mjs", "${CLAUDE_PLUGIN_ROOT}/server.ts"],
           env: {
             TYPEGRAPH_PROJECT_ROOT: ".",
             TYPEGRAPH_TSCONFIG: "./tsconfig.json",
@@ -869,7 +930,7 @@ async function setup(yes: boolean): Promise<void> {
 async function removePlugin(
   projectRoot: string,
   pluginDir: string,
-  options: { removeGlobalCodex: boolean; legacyGlobalCodexCleanup: LegacyGlobalCodexCleanup | null }
+  options: RemovePluginOptions
 ): Promise<void> {
   const s = p.spinner();
   s.start("Removing typegraph-mcp...");
@@ -1056,32 +1117,11 @@ async function remove(yes: boolean): Promise<void> {
     }
   }
 
-  const legacyGlobalCodexCleanup = findLegacyGlobalCodexCleanup(projectRoot);
-  let removeGlobalCodex = cleanGlobalCodex;
-
-  if (legacyGlobalCodexCleanup && !cleanGlobalCodex && !yes) {
-    const shouldRemoveGlobal = await p.confirm({
-      message: "Also remove the stale global Codex MCP entry for this project from ~/.codex/config.toml?",
-      initialValue: false,
-    });
-    if (p.isCancel(shouldRemoveGlobal)) {
-      p.cancel("Removal cancelled.");
-      process.exit(0);
-    }
-    removeGlobalCodex = shouldRemoveGlobal;
-  }
-
-  await removePlugin(projectRoot, pluginDir, {
-    removeGlobalCodex,
-    legacyGlobalCodexCleanup,
-  });
+  const removeOptions = await resolveRemovePluginOptions(projectRoot, yes, cleanGlobalCodex);
+  await removePlugin(projectRoot, pluginDir, removeOptions);
 
-  if (legacyGlobalCodexCleanup && !removeGlobalCodex) {
-    p.log.warn(
-      "Left a stale global Codex MCP entry for this project in ~/.codex/config.toml. " +
-      "Codex may show MCP startup warnings or errors until you remove it. " +
-      "Re-run `typegraph-mcp remove --clean-global-codex` or remove the `typegraph` block manually."
-    );
+  if (removeOptions.warnAboutGlobalCodex) {
+    warnAboutStaleGlobalCodex();
   }
 }
 

package/commands/bench.md

@@ -12,7 +12,7 @@ Run benchmarks to measure typegraph-mcp performance on this project.
 1. Run the benchmark command:
 
    ```bash
-   npx tsx ${CLAUDE_PLUGIN_ROOT}/cli.ts bench
+   "__TYPEGRAPH_NODE__" "${CLAUDE_PLUGIN_ROOT}/node_modules/tsx/dist/cli.mjs" "${CLAUDE_PLUGIN_ROOT}/cli.ts" bench
    ```
 
 2. Parse the output and report results:

package/commands/check.md

@@ -12,7 +12,7 @@ Run health checks to verify typegraph-mcp is correctly set up for this project.
 1. Run the health check command:
 
    ```bash
-   npx tsx ${CLAUDE_PLUGIN_ROOT}/cli.ts check
+   "__TYPEGRAPH_NODE__" "${CLAUDE_PLUGIN_ROOT}/node_modules/tsx/dist/cli.mjs" "${CLAUDE_PLUGIN_ROOT}/cli.ts" check
    ```
 
 2. Parse the output and report results:

package/commands/deep-survey.md

@@ -23,7 +23,7 @@ Follow the phases below in order. Each phase produces findings.
 
 Run the health check first:
 ```bash
-npx tsx ${CLAUDE_PLUGIN_ROOT}/cli.ts check
+"__TYPEGRAPH_NODE__" "${CLAUDE_PLUGIN_ROOT}/node_modules/tsx/dist/cli.mjs" "${CLAUDE_PLUGIN_ROOT}/cli.ts" check
 ```
 
 Record three numbers from the output:

package/commands/test.md

@@ -12,7 +12,7 @@ Run smoke tests that exercise all 14 tools against the current project.
 1. Run the smoke test command:
 
    ```bash
-   npx tsx ${CLAUDE_PLUGIN_ROOT}/cli.ts test
+   "__TYPEGRAPH_NODE__" "${CLAUDE_PLUGIN_ROOT}/node_modules/tsx/dist/cli.mjs" "${CLAUDE_PLUGIN_ROOT}/cli.ts" test
    ```
 
 2. Parse the output and report results:

package/dist/cli.js

@@ -2941,6 +2941,7 @@ Practical rule:
 - combine both when a task spans TypeScript code and surrounding docs/config
 `.trimStart();
 var SNIPPET_MARKER = "## TypeScript Navigation (typegraph-mcp)";
+var CLAUDE_NODE_PLACEHOLDER = "__TYPEGRAPH_NODE__";
 var PLUGIN_DIR_NAME = "plugins/typegraph-mcp";
 var AGENT_IDS = ["claude-code", "cursor", "codex", "gemini", "copilot"];
 var AGENTS = {
@@ -3007,6 +3008,13 @@ var SKILL_FILES = [
   "skills/code-exploration/SKILL.md",
   "skills/deep-survey/SKILL.md"
 ];
+var CLAUDE_TEMPLATE_FILES = /* @__PURE__ */ new Set([
+  "commands/check.md",
+  "commands/test.md",
+  "commands/bench.md",
+  "commands/deep-survey.md",
+  "skills/deep-survey/SKILL.md"
+]);
 var SKILL_NAMES = [
   "tool-selection",
   "impact-analysis",
@@ -3202,6 +3210,31 @@ function removeLegacyGlobalCodexMcp(cleanup) {
   }
   p.log.info("~/.codex/config.toml: removed stale global typegraph MCP server entry for this project");
 }
+async function resolveRemovePluginOptions(projectRoot3, yes2, cleanGlobalCodex) {
+  const legacyGlobalCodexCleanup = findLegacyGlobalCodexCleanup(projectRoot3);
+  let removeGlobalCodex = cleanGlobalCodex;
+  if (legacyGlobalCodexCleanup && !cleanGlobalCodex && !yes2) {
+    const shouldRemoveGlobal = await p.confirm({
+      message: "Also remove the stale global Codex MCP entry for this project from ~/.codex/config.toml?",
+      initialValue: false
+    });
+    if (p.isCancel(shouldRemoveGlobal)) {
+      p.cancel("Removal cancelled.");
+      process.exit(0);
+    }
+    removeGlobalCodex = shouldRemoveGlobal;
+  }
+  return {
+    removeGlobalCodex,
+    legacyGlobalCodexCleanup,
+    warnAboutGlobalCodex: legacyGlobalCodexCleanup !== null && !removeGlobalCodex
+  };
+}
+function warnAboutStaleGlobalCodex() {
+  p.log.warn(
+    "Left a stale global Codex MCP entry for this project in ~/.codex/config.toml. Codex may show MCP startup warnings or errors until you remove it. Re-run `typegraph-mcp remove --clean-global-codex` or remove the `typegraph` block manually."
+  );
+}
 function registerMcpServers(projectRoot3, selectedAgents) {
   if (selectedAgents.includes("cursor")) {
     registerJsonMcp(projectRoot3, ".cursor/mcp.json", "mcpServers");
@@ -3439,7 +3472,11 @@ async function setup(yes2) {
       process.exit(0);
     }
     if (action === "remove") {
-      await removePlugin(projectRoot3, targetDir);
+      const removeOptions = await resolveRemovePluginOptions(projectRoot3, false, false);
+      await removePlugin(projectRoot3, targetDir, removeOptions);
+      if (removeOptions.warnAboutGlobalCodex) {
+        warnAboutStaleGlobalCodex();
+      }
       return;
     }
     if (action === "exit") {
@@ -3465,7 +3502,13 @@ async function setup(yes2) {
     const src = path9.join(sourceDir, file);
     const dest = path9.join(targetDir, file);
     if (fs8.existsSync(src)) {
-      copyFile(src, dest);
+      if (selectedAgents.includes("claude-code") && CLAUDE_TEMPLATE_FILES.has(file)) {
+        const content = fs8.readFileSync(src, "utf-8").replaceAll(CLAUDE_NODE_PLACEHOLDER, process.execPath);
+        fs8.mkdirSync(path9.dirname(dest), { recursive: true });
+        fs8.writeFileSync(dest, content);
+      } else {
+        copyFile(src, dest);
+      }
       copied++;
     } else {
       p.log.warn(`Source file not found: ${file}`);
@@ -3475,8 +3518,8 @@ async function setup(yes2) {
     const mcpConfig = {
       mcpServers: {
         typegraph: {
-          command: "npx",
-          args: ["tsx", "${CLAUDE_PLUGIN_ROOT}/server.ts"],
+          command: process.execPath,
+          args: ["${CLAUDE_PLUGIN_ROOT}/node_modules/tsx/dist/cli.mjs", "${CLAUDE_PLUGIN_ROOT}/server.ts"],
           env: {
             TYPEGRAPH_PROJECT_ROOT: ".",
             TYPEGRAPH_TSCONFIG: "./tsconfig.json"
@@ -3681,27 +3724,10 @@ async function remove(yes2) {
       process.exit(0);
     }
   }
-  const legacyGlobalCodexCleanup = findLegacyGlobalCodexCleanup(projectRoot3);
-  let removeGlobalCodex = cleanGlobalCodex;
-  if (legacyGlobalCodexCleanup && !cleanGlobalCodex && !yes2) {
-    const shouldRemoveGlobal = await p.confirm({
-      message: "Also remove the stale global Codex MCP entry for this project from ~/.codex/config.toml?",
-      initialValue: false
-    });
-    if (p.isCancel(shouldRemoveGlobal)) {
-      p.cancel("Removal cancelled.");
-      process.exit(0);
-    }
-    removeGlobalCodex = shouldRemoveGlobal;
-  }
-  await removePlugin(projectRoot3, pluginDir, {
-    removeGlobalCodex,
-    legacyGlobalCodexCleanup
-  });
-  if (legacyGlobalCodexCleanup && !removeGlobalCodex) {
-    p.log.warn(
-      "Left a stale global Codex MCP entry for this project in ~/.codex/config.toml. Codex may show MCP startup warnings or errors until you remove it. Re-run `typegraph-mcp remove --clean-global-codex` or remove the `typegraph` block manually."
-    );
+  const removeOptions = await resolveRemovePluginOptions(projectRoot3, yes2, cleanGlobalCodex);
+  await removePlugin(projectRoot3, pluginDir, removeOptions);
+  if (removeOptions.warnAboutGlobalCodex) {
+    warnAboutStaleGlobalCodex();
   }
 }
 function resolvePluginDir() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typegraph-mcp",
-  "version": "0.9.35",
+  "version": "0.9.37",
   "description": "Type-aware codebase navigation for AI coding agents — 14 MCP tools powered by tsserver + oxc",
   "license": "MIT",
   "type": "module",

package/skills/deep-survey/SKILL.md

@@ -31,7 +31,7 @@ Follow the phases below in order. Each phase produces findings.
 
 Run the health check first:
 ```bash
-npx tsx ${CLAUDE_PLUGIN_ROOT}/cli.ts check
+"__TYPEGRAPH_NODE__" "${CLAUDE_PLUGIN_ROOT}/node_modules/tsx/dist/cli.mjs" "${CLAUDE_PLUGIN_ROOT}/cli.ts" check
 ```
 
 Record three numbers from the output: