typegraph-mcp 0.9.35 → 0.9.36

package/cli.ts

@@ -41,6 +41,12 @@ interface LegacyGlobalCodexCleanup {
   nextContent: string;
 }
 
+interface RemovePluginOptions {
+  removeGlobalCodex: boolean;
+  legacyGlobalCodexCleanup: LegacyGlobalCodexCleanup | null;
+  warnAboutGlobalCodex: boolean;
+}
+
 // ─── Constants ───────────────────────────────────────────────────────────────
 
 const AGENT_SNIPPET = `
@@ -413,6 +419,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 +765,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;
     }
 
@@ -869,7 +914,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 +1101,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/dist/cli.js

@@ -3202,6 +3202,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 +3464,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") {
@@ -3681,27 +3710,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.36",
   "description": "Type-aware codebase navigation for AI coding agents — 14 MCP tools powered by tsserver + oxc",
   "license": "MIT",
   "type": "module",