chore: refactor import patterns and update to beta versions

Author: yaonyan

deno.lock

@@ -1,6 +1,6 @@
 {
   "name": "@mcpc/cli",
-  "version": "0.1.11",
+  "version": "0.1.12-beta.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/mcpc-tech/mcpc.git"
@@ -12,7 +12,7 @@
     "./app": "./src/app.ts"
   },
   "imports": {
-    "@mcpc/core": "jsr:@mcpc/core@^0.3.1",
+    "@mcpc/core": "jsr:@mcpc/core@^0.3.2-beta.1",
     "@mcpc/utils": "jsr:@mcpc/utils@^0.2.2",
     "@modelcontextprotocol/sdk": "npm:@modelcontextprotocol/sdk@^1.8.0",
     "@mcpc-tech/ripgrep-napi": "npm:@mcpc-tech/ripgrep-napi@^0.0.4",

packages/cli/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcpc/core",
-  "version": "0.3.1",
+  "version": "0.3.2-beta.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/mcpc-tech/mcpc.git"

packages/core/deno.json

@@ -29,7 +29,10 @@ import { sortPluginsByOrder, validatePlugins } from "./plugin-utils.ts";
 // Import new manager modules
 import { PluginManager } from "./utils/plugin-manager.ts";
 import { ToolManager } from "./utils/tool-manager.ts";
-import { buildDependencyGroups } from "./utils/compose-helpers.ts";
+import {
+  buildDependencyGroups,
+  processToolsWithPlugins,
+} from "./utils/compose-helpers.ts";
 import { sanitizePropertyKey } from "./utils/common/provider.ts";
 
 const ALL_TOOLS_PLACEHOLDER = "__ALL__";
@@ -344,10 +347,7 @@ export class ComposableMCPServer extends Server {
     externalTools: Record<string, ComposedTool>,
     mode: ExecutionMode,
   ): Promise<void> {
-    const { processToolsWithPlugins: processTools } = await import(
-      "./utils/compose-helpers.ts"
-    );
-    await processTools(this, externalTools, mode);
+    await processToolsWithPlugins(this, externalTools, mode);
   }
 
   /**

packages/core/src/compose.ts

@@ -1,3 +1,5 @@
+import type { MCPCStep, WorkflowState } from "./utils/state.ts";
+
 export type JSONSchema = Record<string, unknown>;
 
 export type ToolCallback = (args: unknown, extra?: unknown) => unknown;
@@ -20,7 +22,7 @@ export interface RegisterToolParams {
 }
 
 export interface RegisterWorkflowToolParams extends RegisterToolParams {
-  predefinedSteps?: import("./utils/state.ts").MCPCStep[];
+  predefinedSteps?: MCPCStep[];
   ensureStepActions?: string[];
   toolNameToIdMapping?: Map<string, string>;
 }
@@ -36,9 +38,9 @@ export interface ArgsDefCreator {
   action: () => JSONSchema;
   forTool: () => JSONSchema;
   forCurrentState: (
-    state: import("./utils/state.ts").WorkflowState,
+    state: WorkflowState,
   ) => JSONSchema;
-  forNextState: (state: import("./utils/state.ts").WorkflowState) => JSONSchema;
+  forNextState: (state: WorkflowState) => JSONSchema;
   forSampling: () => JSONSchema;
   forAgentic: (
     toolNameToDetailList: [string, unknown][],
@@ -48,11 +50,11 @@ export interface ArgsDefCreator {
   ) => JSONSchema;
   forToolDescription: (
     description: string,
-    state: import("./utils/state.ts").WorkflowState,
+    state: WorkflowState,
   ) => string;
   forInitialStepDescription: (
-    steps: import("./utils/state.ts").MCPCStep[],
-    state: import("./utils/state.ts").WorkflowState,
+    steps: MCPCStep[],
+    state: WorkflowState,
   ) => string;
 }
 

packages/core/src/types.ts

@@ -17,7 +17,7 @@ import { sanitizePropertyKey } from "./common/provider.ts";
  */
 export async function processToolsWithPlugins(
   server: ComposableMCPServer,
-  externalTools: Record<string, ComposedTool>,
+  _externalTools: Record<string, ComposedTool>,
   mode: ExecutionMode,
 ): Promise<void> {
   const toolManager = (server as any).toolManager;
@@ -54,25 +54,6 @@ export async function processToolsWithPlugins(
       processedTool.inputSchema as JSONSchema,
       processedTool.execute,
     );
-
-    if (externalTools[toolId]) {
-      // If a visibility processor is provided by built-in plugins, try to call it.
-      try {
-        const builtIn: any = await import("../plugins/built-in/index.ts");
-        if (builtIn && typeof builtIn.processToolVisibility === "function") {
-          builtIn.processToolVisibility(
-            toolId,
-            processedTool,
-            server,
-            externalTools,
-          );
-        }
-      } catch {
-        // ignore if not present
-      }
-
-      externalTools[toolId] = processedTool;
-    }
   }
 }
 
@@ -98,12 +79,12 @@ export function buildDependencyGroups(
     }
 
     if (!tool) {
-      const allToolNames = [
-        ...toolNameToDetailList.map(([n]) => n),
-      ];
+      const allToolNames = [...toolNameToDetailList.map(([n]) => n)];
       throw new Error(
         `Action ${toolName} not found, available action list: ${
-          allToolNames.join(", ")
+          allToolNames.join(
+            ", ",
+          )
         }`,
       );
     }
@@ -153,7 +134,9 @@ export function registerGlobalTools(
     if (!tool) {
       throw new Error(
         `Global tool ${toolId} not found in registry, available: ${
-          Object.keys(tools).join(", ")
+          Object.keys(
+            tools,
+          ).join(", ")
         }`,
       );
     }

packages/core/src/utils/compose-helpers.ts

@@ -21,6 +21,8 @@ import { createMCPSamplingProvider } from "../mod.ts";
 import { generateText, jsonSchema, stepCountIs, tool } from "ai";
 import process from "node:process";
 import { convertToAISDKTools } from "../../core/src/ai-sdk-adapter.ts";
+import { promisify } from "node:util";
+import { execFile } from "node:child_process";
 
 // Store analysis results
 const analysisResults = new Map<
@@ -84,8 +86,6 @@ const server = await mcpc(
 
 // Get git diff for changed files
 async function getGitDiff(workDir: string, filePath?: string): Promise<string> {
-  const { promisify } = await import("node:util");
-  const { execFile } = await import("node:child_process");
   const execFilePromise = promisify(execFile);
 
   const args = filePath ? ["diff", "HEAD", filePath] : ["diff", "HEAD"];