refactor(@angular/cli): Update MCP tools to use host from context

Author: amishne

packages/angular/cli/src/commands/mcp/tools/build.ts

@@ -7,7 +7,7 @@
  */
 
 import { z } from 'zod';
-import { CommandError, type Host, LocalWorkspaceHost } from '../host';
+import { CommandError, type Host } from '../host';
 import { createStructuredContentOutput } from '../utils';
 import { type McpToolDeclaration, declareTool } from './tool-registry';
 
@@ -107,5 +107,5 @@ Perform a one-off, non-watched build using "ng build". Use this tool whenever th
   isLocalOnly: true,
   inputSchema: buildToolInputSchema.shape,
   outputSchema: buildToolOutputSchema.shape,
-  factory: () => (input) => runBuild(input, LocalWorkspaceHost),
+  factory: (context) => (input) => runBuild(input, context.host),
 });

packages/angular/cli/src/commands/mcp/tools/devserver/devserver-start.ts

@@ -8,7 +8,6 @@
 
 import { z } from 'zod';
 import { LocalDevserver, devserverKey } from '../../devserver';
-import { type Host, LocalWorkspaceHost } from '../../host';
 import { createStructuredContentOutput } from '../../utils';
 import { type McpToolContext, type McpToolDeclaration, declareTool } from '../tool-registry';
 
@@ -39,11 +38,7 @@ function localhostAddress(port: number) {
   return `http://localhost:${port}/`;
 }
 
-export async function startDevserver(
-  input: DevserverStartToolInput,
-  context: McpToolContext,
-  host: Host,
-) {
+export async function startDevserver(input: DevserverStartToolInput, context: McpToolContext) {
   const projectKey = devserverKey(input.project);
 
   let devserver = context.devservers.get(projectKey);
@@ -54,9 +49,9 @@ export async function startDevserver(
     });
   }
 
-  const port = await host.getAvailablePort();
+  const port = await context.host.getAvailablePort();
 
-  devserver = new LocalDevserver({ host, project: input.project, port });
+  devserver = new LocalDevserver({ host: context.host, project: input.project, port });
   devserver.start();
 
   context.devservers.set(projectKey, devserver);
@@ -98,6 +93,6 @@ the first build completes.
   inputSchema: devserverStartToolInputSchema.shape,
   outputSchema: devserverStartToolOutputSchema.shape,
   factory: (context) => (input) => {
-    return startDevserver(input, context, LocalWorkspaceHost);
+    return startDevserver(input, context);
   },
 });

packages/angular/cli/src/commands/mcp/tools/devserver/devserver_spec.ts

@@ -38,11 +38,12 @@ describe('Serve Tools', () => {
 
     mockContext = {
       devservers: new Map(),
+      host: mockHost,
     } as Partial<McpToolContext> as McpToolContext;
   });
 
   it('should start and stop a dev server', async () => {
-    const startResult = await startDevserver({}, mockContext, mockHost);
+    const startResult = await startDevserver({}, mockContext);
     expect(startResult.structuredContent.message).toBe(
       `Development server for project '<default>' started and watching for workspace changes.`,
     );
@@ -56,7 +57,7 @@ describe('Serve Tools', () => {
   });
 
   it('should wait for a build to complete', async () => {
-    await startDevserver({}, mockContext, mockHost);
+    await startDevserver({}, mockContext);
 
     const waitPromise = waitForDevserverBuild({ timeout: 10 }, mockContext);
 
@@ -78,7 +79,7 @@ describe('Serve Tools', () => {
 
   it('should handle multiple dev servers', async () => {
     // Start server for project 1. This uses the basic mockProcess created for the tests.
-    const startResult1 = await startDevserver({ project: 'app-one' }, mockContext, mockHost);
+    const startResult1 = await startDevserver({ project: 'app-one' }, mockContext);
     expect(startResult1.structuredContent.message).toBe(
       `Development server for project 'app-one' started and watching for workspace changes.`,
     );
@@ -87,7 +88,7 @@ describe('Serve Tools', () => {
     // Start server for project 2, returning a new mock process.
     const process2 = new MockChildProcess();
     mockHost.spawn.and.returnValue(process2 as unknown as ChildProcess);
-    const startResult2 = await startDevserver({ project: 'app-two' }, mockContext, mockHost);
+    const startResult2 = await startDevserver({ project: 'app-two' }, mockContext);
     expect(startResult2.structuredContent.message).toBe(
       `Development server for project 'app-two' started and watching for workspace changes.`,
     );
@@ -116,7 +117,7 @@ describe('Serve Tools', () => {
   });
 
   it('should handle server crash', async () => {
-    await startDevserver({ project: 'crash-app' }, mockContext, mockHost);
+    await startDevserver({ project: 'crash-app' }, mockContext);
 
     // Simulate a crash with exit code 1
     mockProcess.stdout.emit('data', 'Fatal error.');
@@ -128,7 +129,7 @@ describe('Serve Tools', () => {
   });
 
   it('wait should timeout if build takes too long', async () => {
-    await startDevserver({ project: 'timeout-app' }, mockContext, mockHost);
+    await startDevserver({ project: 'timeout-app' }, mockContext);
     const waitResult = await waitForDevserverBuild(
       { project: 'timeout-app', timeout: 10 },
       mockContext,
@@ -139,7 +140,7 @@ describe('Serve Tools', () => {
   it('should wait through multiple cycles for a build to complete', async () => {
     jasmine.clock().install();
     try {
-      await startDevserver({}, mockContext, mockHost);
+      await startDevserver({}, mockContext);
 
       // Immediately simulate a build starting so isBuilding() is true.
       mockProcess.stdout.emit('data', '❯ Changes detected. Rebuilding...');

packages/angular/cli/src/commands/mcp/tools/modernize.ts

@@ -8,7 +8,7 @@
 
 import { dirname, join, relative } from 'path';
 import { z } from 'zod';
-import { CommandError, type Host, LocalWorkspaceHost } from '../host';
+import { CommandError, type Host } from '../host';
 import { createStructuredContentOutput, findAngularJsonDir } from '../utils';
 import { type McpToolDeclaration, declareTool } from './tool-registry';
 
@@ -205,5 +205,5 @@ ${TRANSFORMATIONS.map((t) => `  * ${t.name}: ${t.description}`).join('\n')}
   outputSchema: modernizeOutputSchema.shape,
   isLocalOnly: true,
   isReadOnly: false,
-  factory: () => (input) => runModernization(input, LocalWorkspaceHost),
+  factory: (context) => (input) => runModernization(input, context.host),
 });