Merge branch 'main' into fix/makefile_rules_override

Author: worksofliam

cli/src/cli.ts

@@ -12,7 +12,6 @@ export let cliSettings = {
 	userBranch: ``,
 	makeFileNoChildren: false,
 	assumeSourcesArePrograms: false,
-	mcp: -1,
 };
 
 export function infoOut(message: string) {

cli/src/index.ts

@@ -12,7 +12,6 @@ import { allExtensions, referencesFileName } from "./extensions";
 import { getBranchLibraryName } from "./builders/environment";
 import { renameFiles, replaceIncludes } from './utils';
 import { ReadFileSystem } from './readFileSystem';
-import { createMcpServer } from './mcp/web';
 
 const isCli = process.argv.length >= 2 && (process.argv[1].endsWith(`so`) || process.argv[1].endsWith(`index.js`));
 
@@ -79,15 +78,6 @@ async function main() {
 				cliSettings.fileList = true;
 				break;
 
-			case '--mcp':
-				cliSettings.mcp = Number(parms[i + 1]);
-				if (isNaN(cliSettings.mcp) || cliSettings.mcp < 0) {
-					error(`Invalid MCP port number: ${parms[i + 1]}`);
-					process.exit(1);
-				}
-				i++;
-				break;
-
 			case `-h`:
 			case `--help`:
 				console.log(``);
@@ -247,13 +237,6 @@ async function main() {
 			writeFileSync(path.join(cwd, `sourceorbit.json`), JSON.stringify(outJson, null, 2));
 			break;
 	}
-
-	if (cliSettings.mcp > 0) {
-		const server = createMcpServer(targets);
-		server.listen(cliSettings.mcp);
-
-		infoOut(`MCP SSE server started on port ${cliSettings.mcp}.`);
-	}
 }
 
 /**

cli/src/languages/rpgle.ts

@@ -53,7 +53,7 @@ export function setupParser(targets: Targets): Parser {
 				}
 
 			} else {
-				const content = readFileSync(file, { encoding: `utf-8` });
+				const content = await targets.rfs.readFile(file);
 				includeFileCache[file] = content;
 
 				return {

cli/src/mcp/instance.ts

@@ -1046,7 +1046,7 @@ export class Targets {
 
 				const includeDetail = path.parse(include.toPath);
 
-				if (includeDetail.ext !== `.rpgleinc`) {
+				if (includeDetail.ext.toLowerCase() !== `.rpgleinc`) {
 					const possibleName = includeDetail.name.toLowerCase().endsWith(`.pgm`) ? includeDetail.name.substring(0, includeDetail.name.length - 4) : includeDetail.name;
 
 					if (this.suggestions.renames) {