Modularize factory monolith by Shreehari-Acharya · Pull Request #73 · binit2-1/Composter

Shreehari-Acharya · 2026-01-22T08:19:55Z

name: 🔧 Refactor
about: Code refactor with no functional changes

Description

This pull request refactors the packages/mcp package to improve modularity, maintainability, and type safety. The logic has been decoupled into dedicated service layers and utilities, and the tool registration system has been updated to use the modern MCP SDK patterns.

Related Issue

Closes #65 #67 #68 #69 #70

Motivation

The previous implementation of the MCP tools was becoming a monolithic file that was difficult to test and extend. As the number of supported tools grew, the complexity of managing natural language parsing, fuzzy matching, and API calls in a single location became a bottleneck.

Changes Made

Refactored Component and Category Management:

Moved data fetching logic into dedicated api.js and catalog.js service modules. This centralizes authenticated API requests and provides a cleaner interface for retrieving categories, components, and search results.

Optimized Query Processing & Fuzzy Matching:

Extracted natural language processing into nlp.js to handle query routing more efficiently.
Isolated fuzzy matching logic into a standalone fuzzy.js utility, ensuring consistent title and category resolution across all tools.

Modernized Tool Architecture:

Modular Registration: Split monolithic tool definitions into tools/general.js and tools/components.js.
SDK Migration: Updated all tools to use the server.registerTool syntax and modernized Zod schema patterns as supported by the latest @modelcontextprotocol/sdk.
Centralized Initialization: Introduced src/tools/index.js with a registerTools(server) function to streamline server setup.

Improved Formatting & Tooling:

Consolidated display logic into formatting.js to ensure uniform output for code blocks, dependency lists, and user guidance.
Added jsconfig.json to enhance IDE IntelliSense and type checking.
Upgraded zod to v3.24+ / v4.x to leverage improved schema validation and performance.

Impact

Breaking Changes

This PR introduces breaking changes

How Has This Been Tested?

All existing tests pass
Manually tested affected features

Checklist

My code follows the project's style guidelines
I have tested my changes locally
No functional changes (refactor only)

- new file : src/utils/nlp.js & src/utils/regexPatterns.js

- New file : src/utils/fuzzy.js

- update zod to latest - add a jsconfig.json file in packages/mcp

vercel · 2026-01-22T08:20:01Z

@Shreehari-Acharya is attempting to deploy a commit to the binit2-1's projects Team on Vercel.

A member of the Team first needs to authorize it.

Copilot

Pull request overview

This PR refactors the monolithic packages/mcp/lib/factory.js file into a modular architecture by splitting it into dedicated service layers, utilities, and tool registration modules. The refactoring aims to improve code maintainability and testability without introducing functional changes.

Changes:

Extracted API and catalog data fetching into separate service modules (api.js, catalog.js)
Isolated natural language processing, fuzzy matching, formatting, and regex patterns into utility modules
Split tool registration into modular files (tools/general.js, tools/components.js) with centralized initialization
Attempted to upgrade Zod dependency from v3.23.0 to v4.3.5
Added jsconfig.json for IDE support

Reviewed changes

Copilot reviewed 12 out of 13 changed files in this pull request and generated 8 comments.

Show a summary per file

File	Description
packages/mcp/lib/factory.js	Removed all implementation code, now only imports and delegates to tool registration
packages/mcp/src/services/api.js	New service module for authenticated API requests
packages/mcp/src/services/catalog.js	New service module for component and category data fetching
packages/mcp/src/utils/nlp.js	New utility for natural language query processing
packages/mcp/src/utils/fuzzy.js	New utility for fuzzy matching logic
packages/mcp/src/utils/formatting.js	New utility for output formatting
packages/mcp/src/utils/regexPatterns.js	New utility containing regex pattern definitions
packages/mcp/src/tools/index.js	New entry point for tool registration
packages/mcp/src/tools/general.js	New module for general tool registration
packages/mcp/src/tools/components.js	New module for component-related tool registration
packages/mcp/package.json	Updated Zod dependency version
package-lock.json	Updated lock file with new Zod version
packages/mcp/jsconfig.json	New configuration file for IDE type support

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

packages/mcp/src/tools/components.js

packages/mcp/src/utils/fuzzy.js

packages/mcp/src/utils/nlp.js

packages/mcp/src/tools/index.js

packages/mcp/src/tools/general.js

packages/mcp/src/tools/components.js

packages/mcp/lib/factory.js

packages/mcp/src/tools/index.js

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 12 out of 13 changed files in this pull request and generated 7 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

packages/mcp/src/tools/index.js

packages/mcp/src/utils/nlp.js

packages/mcp/src/utils/fuzzy.js

packages/mcp/jsconfig.json

packages/mcp/src/utils/nlp.js

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 12 out of 13 changed files in this pull request and generated 5 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-01-22T08:40:43Z

packages/mcp/src/tools/components.js

+          const normalized = title.toLowerCase();
+          const fuzzyMatch = categoryComponents?.find(c => 
+            c.title.toLowerCase().includes(normalized)
+          );


The fuzzy matching logic here is inconsistent with the logic used in nlp.js (lines 108-111). This implementation only checks if the component title includes the normalized input in one direction, and uses simple toLowerCase() instead of the normalizeText() utility function.

For consistency and better matching behavior, this should use the normalizeText() function from fuzzy.js and check bidirectional inclusion, matching the pattern used in nlp.js.

Copilot · 2026-01-22T08:40:43Z

packages/mcp/src/services/api.js

@@ -0,0 +1,26 @@
+import { getAuthToken, getBaseUrl } from "../../lib/auth";


The import statement is missing the .js file extension. In ES modules, it's a best practice to include file extensions in import statements. While Node.js may resolve this without the extension in some cases, explicit extensions improve clarity and avoid potential issues.

Consider changing to: import { getAuthToken, getBaseUrl } from "../../lib/auth.js";

Suggested change

import { getAuthToken, getBaseUrl } from "../../lib/auth";

import { getAuthToken, getBaseUrl } from "../../lib/auth.js";

Copilot · 2026-01-22T08:40:44Z

packages/mcp/src/tools/components.js

+
+        let component = await getComponent(categoryName, title.trim());
+
+        // Fuzzy logic remains same


This comment states "Fuzzy logic remains same" but the fuzzy matching logic is actually inconsistent with the implementation in nlp.js. The comment is misleading because the logic here is simplified (using only toLowerCase() and one-directional matching) compared to the more sophisticated bidirectional matching with normalizeText() used elsewhere.

Consider updating this comment to accurately describe what the code does, or better yet, extract this logic into a shared utility function to ensure consistency.

Suggested change

// Fuzzy logic remains same

// Simple, case-insensitive, one-directional fuzzy match on component titles

Copilot · 2026-01-22T08:40:44Z

packages/mcp/src/utils/nlp.js

+        const categoryComponents = await getComponentsByCategory(categoryName);
+        if (categoryComponents) {
+          const normalized = normalizeText(titleInput);
+          const fuzzyMatch = categoryComponents.find(c => 
+            normalizeText(c.title).includes(normalized) ||
+            normalized.includes(normalizeText(c.title))
+          );
+          if (fuzzyMatch) {
+            component = await getComponent(categoryName, fuzzyMatch.title);
+          }
+        }
+      }
+
+      if (!component) {
+        const categoryComponents = await getComponentsByCategory(categoryName);


The getComponentsByCategory function is called twice when a component is not found - once on line 106 for fuzzy matching, and again on line 120 for generating suggestions. This results in a redundant API call that impacts performance.

The result from line 106 should be cached and reused on line 120 to avoid the duplicate API call.

Copilot · 2026-01-22T08:40:44Z

packages/mcp/src/utils/formatting.js

+  if (component.dependencies && Object.keys(component.dependencies).length > 0) {
+    const deps = Object.entries(component.dependencies)
+      .map(([pkg, ver]) => `  • \`${pkg}\`: ${ver}`)
+      .join("\n");
+
+    const installCmd = Object.keys(component.dependencies).join(" ");
+    depsSection = `
+---
+
+### 📦 Dependencies
+
+${deps}
+
+**Install command:**
+\`\`\`bash
+npm install ${installCmd}
+\`\`\`
+`;


The dependencies check assumes component.dependencies is already an object, but based on the getDepsCount function (lines 1-11), dependencies can be a string that needs to be parsed. This will cause a runtime error when trying to call Object.keys() on a string.

The code should parse the dependencies first if they are a string, similar to how it's done in getDepsCount.

Suggested change

if (component.dependencies && Object.keys(component.dependencies).length > 0) {

const deps = Object.entries(component.dependencies)

.map(([pkg, ver]) => ` • \`${pkg}\`: ${ver}`)

.join("\n");

const installCmd = Object.keys(component.dependencies).join(" ");

depsSection = `

---

### 📦 Dependencies

${deps}

**Install command:**

\`\`\`bash

npm install ${installCmd}

\`\`\`

`;

if (component.dependencies) {

try {

const deps = typeof component.dependencies === "string"

? JSON.parse(component.dependencies)

: component.dependencies;

if (deps && typeof deps === "object" && !Array.isArray(deps) && Object.keys(deps).length > 0) {

const depsList = Object.entries(deps)

.map(([pkg, ver]) => ` • \`${pkg}\`: ${ver}`)

.join("\n");

const installCmd = Object.keys(deps).join(" ");

depsSection = `

---

### 📦 Dependencies

${depsList}

**Install command:**

\`\`\`bash

npm install ${installCmd}

\`\`\`

`;

}

} catch {

// If dependencies cannot be parsed, skip the dependencies section

}

…harya/Composter into modularize-factory-monolith

Shreehari-Acharya added 7 commits January 22, 2026 10:02

move api function to services/api.js

210816f

move catalog functions to a seperate file src/services/catalog.js

0ad89ae

move markdown templates to utils (src/utils/formatting.js)

0eb0d9c

decouple processNaturalQuery and its related regex patterns

34bedef

- new file : src/utils/nlp.js & src/utils/regexPatterns.js

move fuzzy logic functions to a seperate file

295ea05

- New file : src/utils/fuzzy.js

replace server.tool with server.registerTool and fix exports

f672c55

- update zod to latest - add a jsconfig.json file in packages/mcp

modularise the tool layer of the McpServer

ea1a11d

Copilot AI review requested due to automatic review settings January 22, 2026 08:19

Copilot started reviewing on behalf of Shreehari-Acharya January 22, 2026 08:20 View session

Copilot AI reviewed Jan 22, 2026

View reviewed changes

Update packages/mcp/src/tools/components.js

600dc66

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings January 22, 2026 08:24

Copilot started reviewing on behalf of Shreehari-Acharya January 22, 2026 08:25 View session

Shreehari-Acharya and others added 2 commits January 22, 2026 13:55

Update packages/mcp/src/utils/fuzzy.js

005c387

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update packages/mcp/src/utils/nlp.js

fcd011f

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI reviewed Jan 22, 2026

View reviewed changes

Shreehari-Acharya and others added 2 commits January 22, 2026 14:05

add copilot suggestions (relative path and .js extension)

cdaad8e

Update packages/mcp/jsconfig.json

e0ce770

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings January 22, 2026 08:36

Copilot started reviewing on behalf of Shreehari-Acharya January 22, 2026 08:37 View session

Copilot AI reviewed Jan 22, 2026

View reviewed changes

Shreehari-Acharya added 2 commits January 23, 2026 19:05

fix backend api url and add .js extension to api.js imports

7a6d189

Merge branch 'modularize-factory-monolith' of github.com:Shreehari-Ac…

009d82b

…harya/Composter into modularize-factory-monolith

binit2-1 merged commit 273dbc0 into binit2-1:main Jan 23, 2026
1 of 3 checks passed

		@@ -0,0 +1,26 @@
		import { getAuthToken, getBaseUrl } from "../../lib/auth";


		let component = await getComponent(categoryName, title.trim());

		// Fuzzy logic remains same

	// Fuzzy logic remains same
	// Simple, case-insensitive, one-directional fuzzy match on component titles

Conversation

Shreehari-Acharya commented Jan 22, 2026

name: 🔧 Refactor about: Code refactor with no functional changes

Description

Related Issue

Motivation

Changes Made

Impact

Breaking Changes

How Has This Been Tested?

Checklist

Uh oh!

vercel bot commented Jan 22, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Jan 22, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 22, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 22, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 22, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 22, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

name: 🔧 Refactor
about: Code refactor with no functional changes