@codesys/mcp-toolkit 1.1.5 → 1.1.6

package/dist/server.js

@@ -63,23 +63,10 @@ console.error(`>>> Initial CWD: ${process.cwd()}`);
 const mcp_js_1 = require("@modelcontextprotocol/sdk/server/mcp.js");
 const stdio_js_1 = require("@modelcontextprotocol/sdk/server/stdio.js");
 const zod_1 = require("zod");
-// import { executeCodesysScript } from "./codesys_interop"; // We will replace this
+const codesys_interop_1 = require("./codesys_interop");
 const path = __importStar(require("path"));
 const promises_1 = require("fs/promises");
 const scriptLoader_1 = require("./scriptLoader");
-// Add imports for networking and child processes
-const net = __importStar(require("net"));
-const child_process_1 = require("child_process");
-// --- End Define an interface for configuration ---
-// --- Global variables for persistent CODESYS process and socket client ---
-let codesysProcess = null;
-let codesysClient = null;
-let commandQueue = [];
-let isProcessingCommand = false;
-let socketConnected = false;
-let socketConnecting = false;
-let socketQueue = ''; // Buffer for incoming socket data
-// --- End Global variables ---
 // --- Wrap server logic in an exported function ---
 function startMcpServer(config) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -89,11 +76,9 @@ function startMcpServer(config) {
         const WORKSPACE_DIR = config.workspaceDir;
         const codesysExePath = config.codesysPath;
         const codesysProfileName = config.profileName;
-        const codesysScriptsDir = config.codesysScriptsDir; // Get the scripts directory
         console.error(`SERVER.TS: Using Workspace Directory: ${WORKSPACE_DIR}`);
         console.error(`SERVER.TS: Using CODESYS Path: ${codesysExePath}`);
         console.error(`SERVER.TS: Using CODESYS Profile: ${codesysProfileName}`);
-        console.error(`SERVER.TS: Using CODESYS Scripts Dir: ${codesysScriptsDir}`);
         // --- Sanity check - confirm the path exists if possible ---
         console.error(`SERVER.TS: Checking existence of CODESYS executable: ${codesysExePath}`);
         try {
@@ -128,195 +113,6 @@ function startMcpServer(config) {
             });
         }
         // --- End Helper Function ---
-        // --- Persistent CODESYS Instance Management ---
-        /**
-         * Launches the persistent CODESYS process with the listener script.
-         */
-        function launchCodesysPersistent() {
-            if (codesysProcess) {
-                console.error("SERVER.TS: CODESYS process already running.");
-                return;
-            }
-            const listenerScriptPath = path.join(codesysScriptsDir, 'listener_script.py');
-            console.error(`SERVER.TS: Launching CODESYS with listener script: ${listenerScriptPath}`);
-            // Command to launch CODESYS with the listener script and no UI
-            const command = `"${codesysExePath}" --profile="${codesysProfileName}" --runscript="${listenerScriptPath}" --noUI`;
-            console.error(`SERVER.TS: Executing command: ${command}`);
-            // Use spawn to run the command in the background
-            codesysProcess = (0, child_process_1.spawn)(command, [], {
-                shell: true, // Use shell to handle quotes and spaces in path/profile
-                detached: true, // Allow the child process to run independently of the parent
-                stdio: ['ignore', 'pipe', 'pipe'] // Pipe stdout and stderr
-            });
-            console.error(`SERVER.TS: CODESYS process spawned with PID: ${codesysProcess.pid}`);
-            codesysProcess.stdout.on('data', (data) => {
-                console.log(`CODESYS STDOUT: ${data}`);
-            });
-            codesysProcess.stderr.on('data', (data) => {
-                console.error(`CODESYS STDERR: ${data}`);
-            });
-            codesysProcess.on('error', (err) => {
-                console.error(`SERVER.TS ERROR: Failed to start CODESYS process: ${err.message}`);
-                codesysProcess = null;
-                socketConnected = false;
-                socketConnecting = false;
-                // Attempt to reconnect or handle error appropriately
-            });
-            codesysProcess.on('close', (code) => {
-                console.error(`SERVER.TS: CODESYS process exited with code ${code}`);
-                codesysProcess = null;
-                socketConnected = false;
-                socketConnecting = false;
-                // Handle process exit - maybe attempt to relaunch?
-            });
-            // Unref the process to allow the Node.js event loop to exit if the server is done
-            codesysProcess.unref();
-        }
-        /**
-         * Connects the socket client to the running listener script.
-         */
-        function connectToCodesysListener() {
-            if (codesysClient && socketConnected) {
-                console.error("SERVER.TS: Socket client already connected.");
-                return;
-            }
-            if (socketConnecting) {
-                console.error("SERVER.TS: Socket client already attempting to connect.");
-                return;
-            }
-            socketConnecting = true;
-            console.error(`SERVER.TS: Attempting to connect to CODESYS listener on ${net.isIPv6(HOST) ? `[${HOST}]` : HOST}:${PORT}`);
-            codesysClient = new net.Socket();
-            codesysClient.connect(PORT, HOST, () => {
-                console.error("SERVER.TS: Socket connected to CODESYS listener.");
-                socketConnected = true;
-                socketConnecting = false;
-                // Process any queued commands now that the socket is connected
-                processCommandQueue();
-            });
-            codesysClient.on('data', (data) => {
-                socketQueue += data.toString();
-                // Process incoming data, assuming newline-delimited JSON messages
-                let newlineIndex;
-                while ((newlineIndex = socketQueue.indexOf('\n')) !== -1) {
-                    const message = socketQueue.substring(0, newlineIndex);
-                    socketQueue = socketQueue.substring(newlineIndex + 1);
-                    try {
-                        const response = JSON.parse(message);
-                        console.log("SERVER.TS: Received response from listener:", response);
-                        // Find and resolve the corresponding command in the queue
-                        if (commandQueue.length > 0) {
-                            const { resolve } = commandQueue.shift(); // Get the oldest command
-                            resolve(response);
-                            // Process the next command in the queue
-                            processCommandQueue();
-                        }
-                        else {
-                            console.warn("SERVER.TS: Received unexpected response (command queue empty):", response);
-                        }
-                    }
-                    catch (e) {
-                        console.error("SERVER.TS ERROR: Failed to parse JSON response from listener:", e, "Raw data:", message);
-                        // Handle parsing error - potentially reject the current command
-                        if (commandQueue.length > 0) {
-                            const { reject } = commandQueue.shift();
-                            reject(new Error(`Failed to parse listener response: ${message}`));
-                            processCommandQueue();
-                        }
-                    }
-                }
-            });
-            codesysClient.on('close', () => {
-                console.error("SERVER.TS: Socket connection to CODESYS listener closed.");
-                socketConnected = false;
-                socketConnecting = false;
-                // Handle socket close - attempt to reconnect? Reject pending commands?
-                // For now, reject all pending commands
-                while (commandQueue.length > 0) {
-                    const { reject } = commandQueue.shift();
-                    reject(new Error("Socket connection to CODESYS listener closed."));
-                }
-                // Attempt to reconnect after a delay
-                setTimeout(connectToCodesysListener, 5000); // Retry every 5 seconds
-            });
-            codesysClient.on('error', (err) => {
-                console.error(`SERVER.TS ERROR: Socket error: ${err.message}`);
-                // Error event is often followed by 'close', so cleanup is in 'close' handler
-                socketConnected = false;
-                socketConnecting = false;
-            });
-        }
-        /**
-         * Sends a command to the CODESYS listener script and waits for a response.
-         * This function replaces executeCodesysScript.
-         */
-        function sendCodesysCommand(command) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return new Promise((resolve, reject) => {
-                    commandQueue.push({ command, resolve, reject });
-                    processCommandQueue();
-                });
-            });
-        }
-        /**
-         * Processes the command queue. Sends the next command if the socket is connected and not busy.
-         */
-        function processCommandQueue() {
-            if (commandQueue.length > 0 && socketConnected && !isProcessingCommand) {
-                isProcessingCommand = true;
-                const { command } = commandQueue[0]; // Get the oldest command without removing it yet
-                const commandString = JSON.stringify(command) + '\n';
-                console.log("SERVER.TS: Sending command to listener:", command);
-                codesysClient.write(commandString, (err) => {
-                    if (err) {
-                        console.error("SERVER.TS ERROR: Failed to send command:", err);
-                        // If sending fails, reject the current command and process the next
-                        const { reject } = commandQueue.shift();
-                        reject(err);
-                        isProcessingCommand = false;
-                        processCommandQueue();
-                    }
-                    else {
-                        // Command sent successfully, waiting for response in 'data' handler
-                        // isProcessingCommand remains true until response is received
-                    }
-                });
-            }
-            else if (commandQueue.length > 0 && !socketConnected && !socketConnecting) {
-                console.warn("SERVER.TS: Commands in queue, but socket not connected. Attempting to reconnect.");
-                connectToCodesysListener();
-            }
-        }
-        /**
-         * Gracefully shuts down the CODESYS process and socket connection.
-         */
-        function shutdownCodesysPersistent() {
-            console.error("SERVER.TS: Shutting down persistent CODESYS instance.");
-            if (codesysClient && socketConnected) {
-                // Send exit command and close socket
-                sendCodesysCommand({ command: "exit" }).catch(err => console.error("SERVER.TS ERROR sending exit command:", err));
-                // Give some time for the exit command to be processed before closing socket
-                setTimeout(() => {
-                    if (codesysClient) {
-                        codesysClient.end();
-                        codesysClient = null;
-                    }
-                }, 1000); // Wait 1 second
-            }
-            else if (codesysClient && !socketConnected) {
-                // Socket not connected, just destroy it
-                codesysClient.destroy();
-                codesysClient = null;
-            }
-            if (codesysProcess) {
-                console.error(`SERVER.TS: Terminating CODESYS process (PID: ${codesysProcess.pid}).`);
-                // Use kill with a signal to allow graceful shutdown if CODESYS handles it
-                // 'SIGTERM' (15) is a common signal for graceful termination
-                codesysProcess.kill('SIGTERM');
-                codesysProcess = null;
-            }
-        }
-        // --- End Persistent CODESYS Instance Management ---
         // --- Preload script templates ---
         try {
             yield (0, scriptLoader_1.preloadAllScriptTemplates)();
@@ -329,7 +125,7 @@ function startMcpServer(config) {
         console.error("SERVER.TS: Initializing McpServer...");
         const server = new mcp_js_1.McpServer({
             name: "CODESYS Control MCP Server",
-            version: "1.9.0", // Updated version for persistent instance
+            version: "1.8.0", // Updated version for refactored code
             capabilities: {
                 resources: { listChanged: true },
                 tools: { listChanged: true }
@@ -348,33 +144,23 @@ function startMcpServer(config) {
             var _a, _b, _c, _d, _e;
             console.error(`SERVER.TS Resource request: ${uri.href}`);
             try {
-                // Replace executeCodesysScript with sendCodesysCommand
-                const response = yield sendCodesysCommand({
-                    command: "execute_script",
-                    args: { script_name: "check_status.py" } // Assuming listener script has a generic script execution command
+                const scriptContent = yield (0, scriptLoader_1.loadScriptTemplate)('check_status');
+                const result = yield (0, codesys_interop_1.executeCodesysScript)(scriptContent, codesysExePath, codesysProfileName);
+                const outputLines = result.output.split(/[\r\n]+/).filter(line => line.trim());
+                const statusData = {};
+                outputLines.forEach(line => {
+                    const match = line.match(/^([^:]+):\s*(.*)$/);
+                    if (match) {
+                        statusData[match[1].trim()] = match[2].trim();
+                    }
                 });
-                if (response.status === "success") {
-                    const result = response.result; // Assuming the listener returns the script output in 'result'
-                    const outputLines = result.output.split(/[\r\n]+/).filter(line => line.trim());
-                    const statusData = {};
-                    outputLines.forEach(line => {
-                        const match = line.match(/^([^:]+):\s*(.*)$/);
-                        if (match) {
-                            statusData[match[1].trim()] = match[2].trim();
-                        }
-                    });
-                    const statusText = `CODESYS Status:\n - Scripting OK: ${(_a = statusData['Scripting OK']) !== null && _a !== void 0 ? _a : 'Unknown'}\n - Project Open: ${(_b = statusData['Project Open']) !== null && _b !== void 0 ? _b : 'Unknown'}\n - Project Name: ${(_c = statusData['Project Name']) !== null && _c !== void 0 ? _c : 'Unknown'}\n - Project Path: ${(_d = statusData['Project Path']) !== null && _d !== void 0 ? _d : 'N/A'}`;
-                    const isError = ((_e = statusData['Scripting OK']) === null || _e === void 0 ? void 0 : _e.toLowerCase()) !== 'true'; // Check only scripting status for error
-                    return { contents: [{ uri: uri.href, text: statusText, contentType: "text/plain" }], isError: isError };
-                }
-                else {
-                    // Handle error response from listener
-                    return { contents: [{ uri: uri.href, text: `Listener Error: ${response.message}`, contentType: "text/plain" }], isError: true };
-                }
+                const statusText = `CODESYS Status:\n - Scripting OK: ${(_a = statusData['Scripting OK']) !== null && _a !== void 0 ? _a : 'Unknown'}\n - Project Open: ${(_b = statusData['Project Open']) !== null && _b !== void 0 ? _b : 'Unknown'}\n - Project Name: ${(_c = statusData['Project Name']) !== null && _c !== void 0 ? _c : 'Unknown'}\n - Project Path: ${(_d = statusData['Project Path']) !== null && _d !== void 0 ? _d : 'N/A'}`;
+                const isError = !result.success || ((_e = statusData['Scripting OK']) === null || _e === void 0 ? void 0 : _e.toLowerCase()) !== 'true';
+                return { contents: [{ uri: uri.href, text: statusText, contentType: "text/plain" }], isError: isError };
             }
             catch (error) {
                 console.error(`Error resource ${uri.href}:`, error);
-                return { contents: [{ uri: uri.href, text: `Failed to communicate with listener: ${error.message}`, contentType: "text/plain" }], isError: true };
+                return { contents: [{ uri: uri.href, text: `Failed status script: ${error.message}`, contentType: "text/plain" }], isError: true };
             }
         }));
         // Templates
@@ -398,23 +184,38 @@ function startMcpServer(config) {
             console.error(`Resource request: project structure for ${projectPath}`);
             try {
                 const absoluteProjPath = path.normalize(path.isAbsolute(projectPath) ? projectPath : path.join(WORKSPACE_DIR, projectPath));
-                // Replace executeCodesysScript with sendCodesysCommand
-                // The listener script will handle opening the project and getting the structure
-                const response = yield sendCodesysCommand({
-                    command: "get_project_structure", // New command for listener
-                    args: { project_path: absoluteProjPath }
+                // Load script template and prepare parameters
+                const scriptTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('get_project_structure');
+                const ensureProjectOpenTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('ensure_project_open');
+                const combinedScript = ensureProjectOpenTemplate + '\n\n' + scriptTemplate;
+                const scriptContent = (0, scriptLoader_1.interpolateScript)(combinedScript, {
+                    'PROJECT_FILE_PATH': absoluteProjPath.replace(/\\/g, '\\\\')
                 });
-                if (response.status === "success") {
-                    const structureText = response.structure; // Assuming listener returns structure in 'structure' field
-                    return { contents: [{ uri: uri.href, text: structureText, contentType: "text/plain" }], isError: false };
+                const result = yield (0, codesys_interop_1.executeCodesysScript)(scriptContent, codesysExePath, codesysProfileName);
+                let structureText = `Error retrieving structure for ${absoluteProjPath}.\n\n${result.output}`;
+                let isError = !result.success;
+                if (result.success && result.output.includes("SCRIPT_SUCCESS")) {
+                    const startMarker = "--- PROJECT STRUCTURE START ---";
+                    const endMarker = "--- PROJECT STRUCTURE END ---";
+                    const startIndex = result.output.indexOf(startMarker);
+                    const endIndex = result.output.indexOf(endMarker);
+                    if (startIndex !== -1 && endIndex !== -1 && startIndex < endIndex) {
+                        structureText = result.output.substring(startIndex + startMarker.length, endIndex).replace(/\\n/g, '\n').trim();
+                    }
+                    else {
+                        console.error("Error: Could not find structure markers in script output.");
+                        structureText = `Could not parse structure markers in output for ${absoluteProjPath}.\n\nOutput:\n${result.output}`;
+                        isError = true;
+                    }
                 }
                 else {
-                    return { contents: [{ uri: uri.href, text: `Listener Error: ${response.message}`, contentType: "text/plain" }], isError: true };
+                    isError = true;
                 }
+                return { contents: [{ uri: uri.href, text: structureText, contentType: "text/plain" }], isError: isError };
             }
             catch (error) {
                 console.error(`Error getting structure ${uri.href}:`, error);
-                return { contents: [{ uri: uri.href, text: `Failed to communicate with listener for '${projectPath}': ${error.message}`, contentType: "text/plain" }], isError: true };
+                return { contents: [{ uri: uri.href, text: `Failed structure script for '${projectPath}': ${error.message}`, contentType: "text/plain" }], isError: true };
             }
         }));
         server.resource("pou-code", pouCodeTemplate, (uri, params) => __awaiter(this, void 0, void 0, function* () {
@@ -438,23 +239,51 @@ function startMcpServer(config) {
             try {
                 const absoluteProjPath = path.normalize(path.isAbsolute(projectPath) ? projectPath : path.join(WORKSPACE_DIR, projectPath));
                 const sanitizedPouPath = String(pouPath).replace(/\\/g, '/').replace(/^\/+|\/+$/g, '');
-                // Replace executeCodesysScript with sendCodesysCommand
-                // The listener script will handle opening the project and getting the POU code
-                const response = yield sendCodesysCommand({
-                    command: "get_pou_code", // New command for listener
-                    args: { project_path: absoluteProjPath, pou_path: sanitizedPouPath }
+                // Load script template and prepare parameters
+                const scriptTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('get_pou_code');
+                const ensureProjectOpenTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('ensure_project_open');
+                const findObjectByPathTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('find_object_by_path');
+                const combinedScript = ensureProjectOpenTemplate + '\n\n' + findObjectByPathTemplate + '\n\n' + scriptTemplate;
+                const scriptContent = (0, scriptLoader_1.interpolateScript)(combinedScript, {
+                    'PROJECT_FILE_PATH': absoluteProjPath.replace(/\\/g, '\\\\'),
+                    'POU_FULL_PATH': sanitizedPouPath
                 });
-                if (response.status === "success") {
-                    const codeText = response.code; // Assuming listener returns code in 'code' field
-                    return { contents: [{ uri: uri.href, text: codeText, contentType: "text/plain" }], isError: false };
+                const result = yield (0, codesys_interop_1.executeCodesysScript)(scriptContent, codesysExePath, codesysProfileName);
+                let codeText = `Error retrieving code for object '${sanitizedPouPath}' in project '${absoluteProjPath}'.\n\n${result.output}`;
+                let isError = !result.success;
+                if (result.success && result.output.includes("SCRIPT_SUCCESS")) {
+                    const declStartMarker = "### POU DECLARATION START ###";
+                    const declEndMarker = "### POU DECLARATION END ###";
+                    const implStartMarker = "### POU IMPLEMENTATION START ###";
+                    const implEndMarker = "### POU IMPLEMENTATION END ###";
+                    const declStartIdx = result.output.indexOf(declStartMarker);
+                    const declEndIdx = result.output.indexOf(declEndMarker);
+                    const implStartIdx = result.output.indexOf(implStartMarker);
+                    const implEndIdx = result.output.indexOf(implEndMarker);
+                    let declaration = "/* Declaration not found in output */";
+                    let implementation = "/* Implementation not found in output */";
+                    if (declStartIdx !== -1 && declEndIdx !== -1 && declStartIdx < declEndIdx) {
+                        declaration = result.output.substring(declStartIdx + declStartMarker.length, declEndIdx).replace(/\\n/g, '\n').trim();
+                    }
+                    else {
+                        console.error(`WARN: Declaration markers not found correctly for ${sanitizedPouPath}`);
+                    }
+                    if (implStartIdx !== -1 && implEndIdx !== -1 && implStartIdx < implEndIdx) {
+                        implementation = result.output.substring(implStartIdx + implStartMarker.length, implEndIdx).replace(/\\n/g, '\n').trim();
+                    }
+                    else {
+                        console.error(`WARN: Implementation markers not found correctly for ${sanitizedPouPath}`);
+                    }
+                    codeText = `// ----- Declaration -----\n${declaration}\n\n// ----- Implementation -----\n${implementation}`;
                 }
                 else {
-                    return { contents: [{ uri: uri.href, text: `Listener Error: ${response.message}`, contentType: "text/plain" }], isError: true };
+                    isError = true;
                 }
+                return { contents: [{ uri: uri.href, text: codeText, contentType: "text/plain" }], isError: isError };
             }
             catch (error) {
                 console.error(`Error getting POU code ${uri.href}:`, error);
-                return { contents: [{ uri: uri.href, text: `Failed to communicate with listener for '${pouPath}' in '${projectPath}': ${error.message}`, contentType: "text/plain" }], isError: true };
+                return { contents: [{ uri: uri.href, text: `Failed POU code script for '${pouPath}' in '${projectPath}': ${error.message}`, contentType: "text/plain" }], isError: true };
             }
         }));
         // --- End Resources ---
@@ -466,31 +295,28 @@ function startMcpServer(config) {
             let absPath = path.normalize(path.isAbsolute(filePath) ? filePath : path.join(WORKSPACE_DIR, filePath));
             console.error(`Tool call: open_project: ${absPath}`);
             try {
-                // Replace executeCodesysScript with sendCodesysCommand
-                const response = yield sendCodesysCommand({
-                    command: "open_project", // Command matches tool name
-                    args: { file_path: absPath }
+                // Load the script template and prepare with parameters
+                const scriptTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('open_project');
+                // Combine with required ensure_project_open script (will handle any imports)
+                const ensureProjectOpenScript = yield (0, scriptLoader_1.loadScriptTemplate)('ensure_project_open');
+                const combinedScript = ensureProjectOpenScript + '\n\n' + scriptTemplate;
+                const scriptContent = (0, scriptLoader_1.interpolateScript)(combinedScript, {
+                    'PROJECT_FILE_PATH': absPath.replace(/\\/g, '\\\\')
                 });
-                if (response.status === "success") {
-                    return {
-                        content: [{
-                                type: "text",
-                                text: `Project opened: ${absPath}`
-                            }],
-                        isError: false
-                    };
-                }
-                else {
-                    return {
-                        content: [{ type: "text", text: `Listener Error: ${response.message}` }],
-                        isError: true
-                    };
-                }
+                const result = yield (0, codesys_interop_1.executeCodesysScript)(scriptContent, codesysExePath, codesysProfileName);
+                const success = result.success && result.output.includes("SCRIPT_SUCCESS");
+                return {
+                    content: [{
+                            type: "text",
+                            text: success ? `Project opened: ${absPath}` : `Failed open project ${absPath}. Output:\n${result.output}`
+                        }],
+                    isError: !success
+                };
             }
             catch (e) {
                 console.error(`Error open_project ${absPath}: ${e}`);
                 return {
-                    content: [{ type: "text", text: `Failed to communicate with listener: ${e.message}` }],
+                    content: [{ type: "text", text: `Error: ${e.message}` }],
                     isError: true
                 };
             }
@@ -501,9 +327,9 @@ function startMcpServer(config) {
             const { filePath } = args;
             let absPath = path.normalize(path.isAbsolute(filePath) ? filePath : path.join(WORKSPACE_DIR, filePath));
             console.error(`Tool call: create_project (copy template): ${absPath}`);
-            // Template finding logic remains the same as it doesn't require CODESYS interaction
             let templatePath = "";
             try {
+                // Template finding logic
                 const baseDir = path.dirname(path.dirname(codesysExePath));
                 templatePath = path.normalize(path.join(baseDir, 'Templates', 'Standard.project'));
                 if (!(yield fileExists(templatePath))) {
@@ -539,32 +365,28 @@ function startMcpServer(config) {
                 };
             }
             try {
-                // Replace executeCodesysScript with sendCodesysCommand
-                // The listener script will handle creating the project from template
-                const response = yield sendCodesysCommand({
-                    command: "create_project", // Command matches tool name
-                    args: { file_path: absPath, template_path: templatePath }
+                // Load script template and interpolate parameters
+                const scriptTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('create_project');
+                const scriptContent = (0, scriptLoader_1.interpolateScript)(scriptTemplate, {
+                    'PROJECT_FILE_PATH': absPath.replace(/\\/g, '\\\\'),
+                    'TEMPLATE_PROJECT_PATH': templatePath.replace(/\\/g, '\\\\')
                 });
-                if (response.status === "success") {
-                    return {
-                        content: [{
-                                type: "text",
-                                text: `Project created from template: ${absPath}`
-                            }],
-                        isError: false
-                    };
-                }
-                else {
-                    return {
-                        content: [{ type: "text", text: `Listener Error: ${response.message}` }],
-                        isError: true
-                    };
-                }
+                console.error(">>> create_project (copy-then-open): PREPARED SCRIPT:", scriptContent.substring(0, 500) + "...");
+                const result = yield (0, codesys_interop_1.executeCodesysScript)(scriptContent, codesysExePath, codesysProfileName);
+                console.error(">>> create_project (copy-then-open): EXECUTION RESULT:", JSON.stringify(result));
+                const success = result.success && result.output.includes("SCRIPT_SUCCESS");
+                return {
+                    content: [{
+                            type: "text",
+                            text: success ? `Project created from template: ${absPath}` : `Failed create project ${absPath} from template. Output:\n${result.output}`
+                        }],
+                    isError: !success
+                };
             }
             catch (e) {
                 console.error(`Error create_project ${absPath}: ${e}`);
                 return {
-                    content: [{ type: "text", text: `Failed to communicate with listener: ${e.message}` }],
+                    content: [{ type: "text", text: `Error: ${e.message}` }],
                     isError: true
                 };
             }
@@ -576,32 +398,27 @@ function startMcpServer(config) {
             let absPath = path.normalize(path.isAbsolute(projectFilePath) ? projectFilePath : path.join(WORKSPACE_DIR, projectFilePath));
             console.error(`Tool call: save_project: ${absPath}`);
             try {
-                // Replace executeCodesysScript with sendCodesysCommand
-                // The listener script will handle ensuring the project is open and saving it
-                const response = yield sendCodesysCommand({
-                    command: "save_project", // Command matches tool name
-                    args: { project_file_path: absPath }
+                // Load and combine script templates
+                const saveProjectTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('save_project');
+                const ensureProjectOpenTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('ensure_project_open');
+                const combinedScript = ensureProjectOpenTemplate + '\n\n' + saveProjectTemplate;
+                const scriptContent = (0, scriptLoader_1.interpolateScript)(combinedScript, {
+                    'PROJECT_FILE_PATH': absPath.replace(/\\/g, '\\\\')
                 });
-                if (response.status === "success") {
-                    return {
-                        content: [{
-                                type: "text",
-                                text: `Project saved: ${absPath}`
-                            }],
-                        isError: false
-                    };
-                }
-                else {
-                    return {
-                        content: [{ type: "text", text: `Listener Error: ${response.message}` }],
-                        isError: true
-                    };
-                }
+                const result = yield (0, codesys_interop_1.executeCodesysScript)(scriptContent, codesysExePath, codesysProfileName);
+                const success = result.success && result.output.includes("SCRIPT_SUCCESS");
+                return {
+                    content: [{
+                            type: "text",
+                            text: success ? `Project saved: ${absPath}` : `Failed save project ${absPath}. Output:\n${result.output}`
+                        }],
+                    isError: !success
+                };
             }
             catch (e) {
                 console.error(`Error save_project ${absPath}: ${e}`);
                 return {
-                    content: [{ type: "text", text: `Failed to communicate with listener: ${e.message}` }],
+                    content: [{ type: "text", text: `Error: ${e.message}` }],
                     isError: true
                 };
             }
@@ -619,261 +436,260 @@ function startMcpServer(config) {
             const sanName = name.trim();
             console.error(`Tool call: create_pou: Name='${sanName}', Type='${type}', Lang='${language}', Parent='${sanParentPath}', Project='${absPath}'`);
             try {
-                // Replace executeCodesysScript with sendCodesysCommand
-                // The listener script will handle opening the project and creating the POU
-                const response = yield sendCodesysCommand({
-                    command: "create_pou", // Command matches tool name
-                    args: {
-                        project_file_path: absPath,
-                        name: sanName,
-                        type: type,
-                        language: language,
-                        parent_path: sanParentPath
-                    }
+                // Load and combine script templates
+                const createPouTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('create_pou');
+                const ensureProjectOpenTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('ensure_project_open');
+                const findObjectByPathTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('find_object_by_path');
+                const combinedScript = ensureProjectOpenTemplate + '\n\n' + findObjectByPathTemplate + '\n\n' + createPouTemplate;
+                const scriptContent = (0, scriptLoader_1.interpolateScript)(combinedScript, {
+                    'PROJECT_FILE_PATH': absPath.replace(/\\/g, '\\\\'),
+                    'POU_NAME': sanName,
+                    'POU_TYPE_STR': type,
+                    'IMPL_LANGUAGE_STR': language,
+                    'PARENT_PATH': sanParentPath
                 });
-                if (response.status === "success") {
-                    return {
-                        content: [{
-                                type: "text",
-                                text: `POU '${sanName}' created in '${sanParentPath}' of ${absPath}. Project saved.`
-                            }],
-                        isError: false
-                    };
-                }
-                else {
-                    return {
-                        content: [{ type: "text", text: `Listener Error: ${response.message}` }],
-                        isError: true
-                    };
-                }
+                console.error(">>> create_pou: PREPARED SCRIPT:", scriptContent.substring(0, 500) + "...");
+                const result = yield (0, codesys_interop_1.executeCodesysScript)(scriptContent, codesysExePath, codesysProfileName);
+                console.error(">>> create_pou: EXECUTION RESULT:", JSON.stringify(result));
+                const success = result.success && result.output.includes("SCRIPT_SUCCESS");
+                return {
+                    content: [{
+                            type: "text",
+                            text: success ? `POU '${sanName}' created in '${sanParentPath}' of ${absPath}. Project saved.` : `Failed create POU '${sanName}'. Output:\n${result.output}`
+                        }],
+                    isError: !success
+                };
             }
             catch (e) {
                 console.error(`Error create_pou ${sanName} in ${absPath}: ${e}`);
                 return {
-                    content: [{ type: "text", text: `Failed to communicate with listener: ${e.message}` }],
+                    content: [{ type: "text", text: `Error: ${e.message}` }],
                     isError: true
                 };
             }
         }));
         server.tool("set_pou_code", "Sets the declaration and/or implementation code for a specific POU, Method, or Property.", {
             projectFilePath: zod_1.z.string().describe("Path to the project file (e.g., 'C:/Projects/MyPLC.project')."),
-            pouPath: zod_1.z.string().describe("Relative path to the POU, Method, or Property (e.g., 'Application.PLC_PRG' or 'Application.MyFB.MyMethod')."),
-            declaration: zod_1.z.string().optional().describe("The new declaration code for the POU."),
-            implementation: zod_1.z.string().optional().describe("The new implementation code for the POU.")
+            pouPath: zod_1.z.string().describe("Full relative path to the target object (e.g., 'Application/MyPOU', 'MyFolder/MyFB/MyMethod', 'MyFolder/MyFB/MyProperty')."),
+            declarationCode: zod_1.z.string().describe("Code for the declaration part (VAR...END_VAR). If omitted, the declaration is not changed.").optional(),
+            implementationCode: zod_1.z.string().describe("Code for the implementation logic part. If omitted, the implementation is not changed.").optional()
         }, (args) => __awaiter(this, void 0, void 0, function* () {
-            const { projectFilePath, pouPath, declaration, implementation } = args;
-            let absPath = path.normalize(path.isAbsolute(projectFilePath) ? projectFilePath : path.join(WORKSPACE_DIR, projectFilePath));
-            const sanPouPath = pouPath.replace(/\\/g, '/').replace(/^\/+|\/+$/g, '');
-            console.error(`Tool call: set_pou_code: POU='${sanPouPath}', Project='${absPath}'`);
-            if (declaration === undefined && implementation === undefined) {
+            const { projectFilePath, pouPath, declarationCode, implementationCode } = args;
+            if (declarationCode === undefined && implementationCode === undefined) {
                 return {
-                    content: [{ type: "text", text: "Error: Either 'declaration' or 'implementation' must be provided." }],
+                    content: [{ type: "text", text: "Error: At least one of declarationCode or implementationCode must be provided." }],
                     isError: true
                 };
             }
+            let absPath = path.normalize(path.isAbsolute(projectFilePath) ? projectFilePath : path.join(WORKSPACE_DIR, projectFilePath));
+            const sanPouPath = pouPath.replace(/\\/g, '/').replace(/^\/+|\/+$/g, '');
+            console.error(`Tool call: set_pou_code: Target='${sanPouPath}', Project='${absPath}'`);
             try {
-                // Replace executeCodesysScript with sendCodesysCommand
-                // The listener script will handle opening the project and setting the POU code
-                const response = yield sendCodesysCommand({
-                    command: "set_pou_code", // Command matches tool name
-                    args: {
-                        project_file_path: absPath,
-                        pou_path: sanPouPath,
-                        declaration: declaration,
-                        implementation: implementation
-                    }
+                // Load and combine script templates
+                const setPouCodeTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('set_pou_code');
+                const ensureProjectOpenTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('ensure_project_open');
+                const findObjectByPathTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('find_object_by_path');
+                const combinedScript = ensureProjectOpenTemplate + '\n\n' + findObjectByPathTemplate + '\n\n' + setPouCodeTemplate;
+                // Escape content for Python triple-quoted strings
+                const sanDeclCode = (declarationCode !== null && declarationCode !== void 0 ? declarationCode : "").replace(/\\/g, '\\\\').replace(/"""/g, '\\"\\"\\"');
+                const sanImplCode = (implementationCode !== null && implementationCode !== void 0 ? implementationCode : "").replace(/\\/g, '\\\\').replace(/"""/g, '\\"\\"\\"');
+                const scriptContent = (0, scriptLoader_1.interpolateScript)(combinedScript, {
+                    'PROJECT_FILE_PATH': absPath.replace(/\\/g, '\\\\'),
+                    'POU_FULL_PATH': sanPouPath,
+                    'DECLARATION_CONTENT': sanDeclCode,
+                    'IMPLEMENTATION_CONTENT': sanImplCode
                 });
-                if (response.status === "success") {
-                    return {
-                        content: [{
-                                type: "text",
-                                text: `Code set for POU '${sanPouPath}' in ${absPath}. Project saved.`
-                            }],
-                        isError: false
-                    };
-                }
-                else {
-                    return {
-                        content: [{ type: "text", text: `Listener Error: ${response.message}` }],
-                        isError: true
-                    };
-                }
+                console.error(">>> set_pou_code: PREPARED SCRIPT:", scriptContent.substring(0, 500) + "...");
+                const result = yield (0, codesys_interop_1.executeCodesysScript)(scriptContent, codesysExePath, codesysProfileName);
+                console.error(">>> set_pou_code: EXECUTION RESULT:", JSON.stringify(result));
+                const success = result.success && result.output.includes("SCRIPT_SUCCESS");
+                return {
+                    content: [{
+                            type: "text",
+                            text: success ? `Code set for '${sanPouPath}' in ${absPath}. Project saved.` : `Failed set code for '${sanPouPath}'. Output:\n${result.output}`
+                        }],
+                    isError: !success
+                };
             }
             catch (e) {
                 console.error(`Error set_pou_code ${sanPouPath} in ${absPath}: ${e}`);
                 return {
-                    content: [{ type: "text", text: `Failed to communicate with listener: ${e.message}` }],
+                    content: [{ type: "text", text: `Error: ${e.message}` }],
                     isError: true
                 };
             }
         }));
-        server.tool("create_method", "Creates a new Method within a Function Block.", {
+        server.tool("create_property", "Creates a new Property within a specific Function Block POU.", {
             projectFilePath: zod_1.z.string().describe("Path to the project file (e.g., 'C:/Projects/MyPLC.project')."),
-            functionBlockPath: zod_1.z.string().describe("Relative path to the parent Function Block (e.g., 'Application.MyFB')."),
-            name: zod_1.z.string().describe("Name for the new Method (must be a valid IEC identifier)."),
-            language: ImplementationLanguageEnum.describe("Implementation language (ST, LD, FBD, etc.). CODESYS default will be used if specific language is not set."),
+            parentPouPath: zod_1.z.string().describe("Relative path to the parent Function Block POU (e.g., 'Application/MyFB')."),
+            propertyName: zod_1.z.string().describe("Name for the new property (must be a valid IEC identifier)."),
+            propertyType: zod_1.z.string().describe("Data type of the property (e.g., 'BOOL', 'INT', 'MyDUT').")
         }, (args) => __awaiter(this, void 0, void 0, function* () {
-            const { projectFilePath, functionBlockPath, name, language } = args;
+            const { projectFilePath, parentPouPath, propertyName, propertyType } = args;
             let absPath = path.normalize(path.isAbsolute(projectFilePath) ? projectFilePath : path.join(WORKSPACE_DIR, projectFilePath));
-            const sanFBPath = functionBlockPath.replace(/\\/g, '/').replace(/^\/+|\/+$/g, '');
-            const sanName = name.trim();
-            console.error(`Tool call: create_method: Name='${sanName}', Lang='${language}', Parent='${sanFBPath}', Project='${absPath}'`);
+            const sanParentPath = parentPouPath.replace(/\\/g, '/').replace(/^\/+|\/+$/g, '');
+            const sanPropName = propertyName.trim();
+            const sanPropType = propertyType.trim();
+            console.error(`Tool call: create_property: Name='${sanPropName}', Type='${sanPropType}', ParentPOU='${sanParentPath}', Project='${absPath}'`);
+            if (!sanPropName || !sanPropType) {
+                return {
+                    content: [{ type: "text", text: `Error: Property name and type cannot be empty.` }],
+                    isError: true
+                };
+            }
             try {
-                // Replace executeCodesysScript with sendCodesysCommand
-                const response = yield sendCodesysCommand({
-                    command: "create_method", // Command matches tool name
-                    args: {
-                        project_file_path: absPath,
-                        function_block_path: sanFBPath,
-                        name: sanName,
-                        language: language
-                    }
+                // Load and combine script templates
+                const createPropertyTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('create_property');
+                const ensureProjectOpenTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('ensure_project_open');
+                const findObjectByPathTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('find_object_by_path');
+                const combinedScript = ensureProjectOpenTemplate + '\n\n' + findObjectByPathTemplate + '\n\n' + createPropertyTemplate;
+                const scriptContent = (0, scriptLoader_1.interpolateScript)(combinedScript, {
+                    'PROJECT_FILE_PATH': absPath.replace(/\\/g, '\\\\'),
+                    'PARENT_POU_FULL_PATH': sanParentPath,
+                    'PROPERTY_NAME': sanPropName,
+                    'PROPERTY_TYPE': sanPropType
                 });
-                if (response.status === "success") {
-                    return {
-                        content: [{
-                                type: "text",
-                                text: `Method '${sanName}' created in '${sanFBPath}' of ${absPath}. Project saved.`
-                            }],
-                        isError: false
-                    };
-                }
-                else {
-                    return {
-                        content: [{ type: "text", text: `Listener Error: ${response.message}` }],
-                        isError: true
-                    };
-                }
+                console.error(">>> create_property: PREPARED SCRIPT:", scriptContent.substring(0, 500) + "...");
+                const result = yield (0, codesys_interop_1.executeCodesysScript)(scriptContent, codesysExePath, codesysProfileName);
+                console.error(">>> create_property: EXECUTION RESULT:", JSON.stringify(result));
+                const success = result.success && result.output.includes("SCRIPT_SUCCESS");
+                return {
+                    content: [{
+                            type: "text",
+                            text: success ? `Property '${sanPropName}' created under '${sanParentPath}' in ${absPath}. Project saved.` : `Failed to create property '${sanPropName}'. Output:\n${result.output}`
+                        }],
+                    isError: !success
+                };
             }
             catch (e) {
-                console.error(`Error create_method ${sanName} in ${absPath}: ${e}`);
+                console.error(`Error create_property ${sanPropName} in ${absPath}: ${e}`);
                 return {
-                    content: [{ type: "text", text: `Failed to communicate with listener: ${e.message}` }],
+                    content: [{ type: "text", text: `Error: ${e.message}` }],
                     isError: true
                 };
             }
         }));
-        server.tool("create_property", "Creates a new Property within a Function Block.", {
+        server.tool("create_method", "Creates a new Method within a specific Function Block POU.", {
             projectFilePath: zod_1.z.string().describe("Path to the project file (e.g., 'C:/Projects/MyPLC.project')."),
-            functionBlockPath: zod_1.z.string().describe("Relative path to the parent Function Block (e.g., 'Application.MyFB')."),
-            name: zod_1.z.string().describe("Name for the new Property (must be a valid IEC identifier)."),
-            dataType: zod_1.z.string().describe("Data type of the Property (e.g., 'INT', 'BOOL')."),
-            isRetain: zod_1.z.boolean().optional().default(false).describe("Whether the Property should be RETAIN."),
-            isPersistent: zod_1.z.boolean().optional().default(false).describe("Whether the Property should be PERSISTENT."),
-            isConstant: zod_1.z.boolean().optional().default(false).describe("Whether the Property should be CONSTANT."),
-            initialValue: zod_1.z.string().optional().describe("Initial value for the Property."),
-            comment: zod_1.z.string().optional().describe("Comment for the Property.")
+            parentPouPath: zod_1.z.string().describe("Relative path to the parent Function Block POU (e.g., 'Application/MyFB')."),
+            methodName: zod_1.z.string().describe("Name of the new method (must be a valid IEC identifier)."),
+            returnType: zod_1.z.string().optional().describe("Return type (e.g., 'BOOL', 'INT'). Leave empty or omit for no return value (PROCEDURE).")
         }, (args) => __awaiter(this, void 0, void 0, function* () {
-            const { projectFilePath, functionBlockPath, name, dataType, isRetain, isPersistent, isConstant, initialValue, comment } = args;
+            const { projectFilePath, parentPouPath, methodName, returnType } = args;
             let absPath = path.normalize(path.isAbsolute(projectFilePath) ? projectFilePath : path.join(WORKSPACE_DIR, projectFilePath));
-            const sanFBPath = functionBlockPath.replace(/\\/g, '/').replace(/^\/+|\/+$/g, '');
-            const sanName = name.trim();
-            console.error(`Tool call: create_property: Name='${sanName}', Type='${dataType}', Parent='${sanFBPath}', Project='${absPath}'`);
+            const sanParentPath = parentPouPath.replace(/\\/g, '/').replace(/^\/+|\/+$/g, '');
+            const sanMethName = methodName.trim();
+            const sanReturnType = (returnType !== null && returnType !== void 0 ? returnType : "").trim();
+            console.error(`Tool call: create_method: Name='${sanMethName}', Return='${sanReturnType}', ParentPOU='${sanParentPath}', Project='${absPath}'`);
+            if (!sanMethName) {
+                return {
+                    content: [{ type: "text", text: `Error: Method name cannot be empty.` }],
+                    isError: true
+                };
+            }
             try {
-                // Replace executeCodesysScript with sendCodesysCommand
-                const response = yield sendCodesysCommand({
-                    command: "create_property", // Command matches tool name
-                    args: {
-                        project_file_path: absPath,
-                        function_block_path: sanFBPath,
-                        name: sanName,
-                        data_type: dataType,
-                        is_retain: isRetain,
-                        is_persistent: isPersistent,
-                        is_constant: isConstant,
-                        initial_value: initialValue,
-                        comment: comment
-                    }
+                // Load and combine script templates
+                const createMethodTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('create_method');
+                const ensureProjectOpenTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('ensure_project_open');
+                const findObjectByPathTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('find_object_by_path');
+                const combinedScript = ensureProjectOpenTemplate + '\n\n' + findObjectByPathTemplate + '\n\n' + createMethodTemplate;
+                const scriptContent = (0, scriptLoader_1.interpolateScript)(combinedScript, {
+                    'PROJECT_FILE_PATH': absPath.replace(/\\/g, '\\\\'),
+                    'PARENT_POU_FULL_PATH': sanParentPath,
+                    'METHOD_NAME': sanMethName,
+                    'RETURN_TYPE': sanReturnType
                 });
-                if (response.status === "success") {
-                    return {
-                        content: [{
-                                type: "text",
-                                text: `Property '${sanName}' created in '${sanFBPath}' of ${absPath}. Project saved.`
-                            }],
-                        isError: false
-                    };
-                }
-                else {
-                    return {
-                        content: [{ type: "text", text: `Listener Error: ${response.message}` }],
-                        isError: true
-                    };
-                }
+                console.error(">>> create_method: PREPARED SCRIPT:", scriptContent.substring(0, 500) + "...");
+                const result = yield (0, codesys_interop_1.executeCodesysScript)(scriptContent, codesysExePath, codesysProfileName);
+                console.error(">>> create_method: EXECUTION RESULT:", JSON.stringify(result));
+                const success = result.success && result.output.includes("SCRIPT_SUCCESS");
+                return {
+                    content: [{
+                            type: "text",
+                            text: success ? `Method '${sanMethName}' created under '${sanParentPath}' in ${absPath}. Project saved.` : `Failed to create method '${sanMethName}'. Output:\n${result.output}`
+                        }],
+                    isError: !success
+                };
             }
             catch (e) {
-                console.error(`Error create_property ${sanName} in ${absPath}: ${e}`);
+                console.error(`Error create_method ${sanMethName} in ${absPath}: ${e}`);
                 return {
-                    content: [{ type: "text", text: `Failed to communicate with listener: ${e.message}` }],
+                    content: [{ type: "text", text: `Error: ${e.message}` }],
                     isError: true
                 };
             }
         }));
-        server.tool("compile_project", "Compiles the specified CODESYS project.", {
-            projectFilePath: zod_1.z.string().describe("Path to the project file (e.g., 'C:/Projects/MyPLC.project').")
+        server.tool("compile_project", "Compiles (Builds) the primary application within a CODESYS project.", {
+            projectFilePath: zod_1.z.string().describe("Path to the project file containing the application to compile (e.g., 'C:/Projects/MyPLC.project').")
         }, (args) => __awaiter(this, void 0, void 0, function* () {
             const { projectFilePath } = args;
             let absPath = path.normalize(path.isAbsolute(projectFilePath) ? projectFilePath : path.join(WORKSPACE_DIR, projectFilePath));
-            console.error(`Tool call: compile_project: Project='${absPath}'`);
+            console.error(`Tool call: compile_project: ${absPath}`);
             try {
-                // Replace executeCodesysScript with sendCodesysCommand
-                const response = yield sendCodesysCommand({
-                    command: "compile_project", // Command matches tool name
-                    args: { project_file_path: absPath }
+                // Load and combine script templates
+                const compileProjectTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('compile_project');
+                const ensureProjectOpenTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('ensure_project_open');
+                const combinedScript = ensureProjectOpenTemplate + '\n\n' + compileProjectTemplate;
+                const scriptContent = (0, scriptLoader_1.interpolateScript)(combinedScript, {
+                    'PROJECT_FILE_PATH': absPath.replace(/\\/g, '\\\\')
                 });
-                if (response.status === "success") {
-                    return {
-                        content: [{
-                                type: "text",
-                                text: `Project compiled: ${absPath}. Output:\n${response.output}` // Assuming listener returns compile output
-                            }],
-                        isError: false
-                    };
-                }
-                else {
-                    return {
-                        content: [{ type: "text", text: `Listener Error: ${response.message}\nOutput:\n${response.output}` }],
-                        isError: true
-                    };
+                const result = yield (0, codesys_interop_1.executeCodesysScript)(scriptContent, codesysExePath, codesysProfileName);
+                const success = result.success && result.output.includes("SCRIPT_SUCCESS");
+                // Check for actual compile errors in the output log
+                const hasCompileErrors = result.output.includes("Compile complete --") && !/ 0 error\(s\),/.test(result.output);
+                let message = success ? `Compilation initiated for application in ${absPath}. Check CODESYS messages for results.` : `Failed initiating compilation for ${absPath}. Output:\n${result.output}`;
+                let isError = !success; // Base error status on script success
+                if (success && hasCompileErrors) {
+                    message += " WARNING: Build command reported errors in the output log.";
+                    console.warn("Compile project reported build errors in the output.");
+                    // Report as error if compile fails, even if script technically succeeded
+                    isError = true;
                 }
+                return {
+                    content: [{ type: "text", text: message }],
+                    isError: isError
+                };
             }
             catch (e) {
                 console.error(`Error compile_project ${absPath}: ${e}`);
                 return {
-                    content: [{ type: "text", text: `Failed to communicate with listener: ${e.message}` }],
+                    content: [{ type: "text", text: `Error: ${e.message}` }],
                     isError: true
                 };
             }
         }));
         // --- End Tools ---
         console.error("SERVER.TS: Resources and Tools defined.");
-        // --- Start the persistent CODESYS instance and connect the socket client ---
-        launchCodesysPersistent();
-        // Give CODESYS a moment to start before attempting to connect
-        setTimeout(connectToCodesysListener, 2000); // Wait 2 seconds
-        // --- End Startup of Persistent Instance ---
-        // --- Start the MCP Server Transport ---
-        console.error("SERVER.TS: Starting StdioServerTransport...");
-        const transport = new stdio_js_1.StdioServerTransport();
-        server.connect(transport);
-        console.error("SERVER.TS: StdioServerTransport started.");
-        // --- End Start the MCP Server Transport ---
-        // --- Handle process signals for graceful shutdown ---
-        process.on('SIGINT', () => {
-            console.error("SERVER.TS: Received SIGINT. Shutting down.");
-            shutdownCodesysPersistent();
-            process.exit(0);
-        });
-        process.on('SIGTERM', () => {
-            console.error("SERVER.TS: Received SIGTERM. Shutting down.");
-            shutdownCodesysPersistent();
-            process.exit(0);
-        });
-        // --- End Signal Handling ---
-        console.error(">>> SERVER.TS startMcpServer() FINISHED <<<");
+        // --- End MCP Resources / Tools Definitions ---
+        // --- Server Connection ---
+        console.error("SERVER.TS: startServer() internal logic executing.");
+        try {
+            const transport = new stdio_js_1.StdioServerTransport();
+            console.error("SERVER.TS: Connecting MCP server via stdio...");
+            // No need to await connect here if startMcpServer is called by bin.ts which awaits it
+            server.connect(transport); // Connect but don't await here, let bin.ts handle waiting
+            console.error("SERVER.TS: MCP Server connection initiated via stdio.");
+        }
+        catch (error) {
+            console.error("FATAL: Failed to initiate MCP server connection:", error);
+            // Re-throw error so bin.ts can catch it
+            throw error;
+        }
+        // --- End Server Connection ---
     });
-}
-// --- Define the socket listener host and port ---
-const HOST = '127.0.0.1';
-const PORT = 65432;
-// --- End Define host and port ---
+} // --- End of startMcpServer function ---
+// --- Graceful Shutdown / Unhandled Rejection ---
+// These should remain at the top level, outside startMcpServer
+process.on('SIGINT', () => {
+    console.error('\nSERVER.TS: SIGINT received, shutting down...');
+    process.exit(0);
+});
+process.on('SIGTERM', () => {
+    console.error('\nSERVER.TS: SIGTERM received, shutting down...');
+    process.exit(0);
+});
+process.on('unhandledRejection', (reason, promise) => {
+    console.error('SERVER.TS: Unhandled Rejection at:', promise, 'reason:', reason);
+});
+// --- End Graceful Shutdown / Unhandled Rejection ---
+console.error(">>> SERVER.TS Module Parsed <<<"); // Log end of script parsing