@codesys/mcp-toolkit 1.4.4 → 1.4.6

package/CHANGELOG.md

@@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.4.6] - 2025-05-02
+### Fixed
+- Fixed session management "hanging" issue with start_session
+- Added stdout flushing in Python scripts to ensure output is visible
+- Improved session script logging for better debugging
+- Added more detailed state information in session scripts
+
+## [1.4.5] - 2025-05-02
+### Fixed
+- Completely redesigned path handling for Windows paths
+- Removed raw string (r'...') approach for more direct path handling
+- Implemented path normalization using forward slashes for cross-platform compatibility
+- Fixed create_project script to properly handle Windows paths in IronPython environment
+
 ## [1.4.4] - 2025-05-02
 ### Fixed
 - Fixed "unexpected token 'C'" error in create_project script

package/dist/scriptLoader.js

@@ -121,19 +121,14 @@ function interpolateScript(template, params) {
     let result = template;
     // Replace each parameter in the template
     for (const [key, value] of Object.entries(params)) {
-        // Handle Windows paths specially
-        let escapedValue;
-        // Check if this looks like a Windows path
-        if (typeof value === 'string' && (value.includes(':\\') || value.includes('\\'))) {
-            // For Windows paths, use a different approach with raw strings
-            console.error(`SCRIPT_LOADER: Detected Windows path: ${value}`);
-            // Use Python raw string format to avoid backslash interpretation issues
-            escapedValue = `r'${value.replace(/'/g, "\\'")}'`;
-            console.error(`SCRIPT_LOADER: Converted to Python raw string: ${escapedValue}`);
-        }
-        else {
-            // For non-path values, just escape backslashes normally
-            escapedValue = String(value).replace(/\\/g, '\\\\');
+        // Get the escaped value, handling special characters
+        // Note: We've changed our approach to use forward slashes everywhere
+        // and handle the path normalization in each script instead of using r-strings
+        let escapedValue = String(value);
+        // If value has single quotes, escape them
+        if (escapedValue.includes("'")) {
+            escapedValue = escapedValue.replace(/'/g, "\\'");
+            console.error(`SCRIPT_LOADER: Escaped single quotes in value: ${escapedValue}`);
         }
         // Replace {PARAM_NAME} with the escaped value
         const paramPattern = new RegExp(`\\{${key}\\}`, 'g');

package/dist/scripts/create_project.py

@@ -1,34 +1,13 @@
 import sys, scriptengine as script_engine, os, shutil, time, traceback
-# Placeholders for paths - note that these might be prefixed with r' for raw strings
-# from the TypeScript/Node.js side due to Windows path handling
-TEMPLATE_PROJECT_PATH_RAW = '{TEMPLATE_PROJECT_PATH}' # Path to Standard.project 
-PROJECT_FILE_PATH_RAW = '{PROJECT_FILE_PATH}'    # Path for the new project (Target Path)
 
-# Process paths that might be Python raw strings (r'path')
-def extract_path(path_str):
-    # Check if path starts with r' prefix and ends with ' (raw string notation)
-    if isinstance(path_str, str):
-        if path_str.startswith("r'") and path_str.endswith("'"):
-            try:
-                # Extract the content between r' and '
-                return path_str[2:-1]
-            except Exception as e:
-                print("DEBUG: Error extracting raw string content: %s" % e)
-                return path_str
-    return path_str
+# Direct path assignment - no more raw string handling
+# Paths will be correctly escaped in the template substitution
+TEMPLATE_PROJECT_PATH = '{TEMPLATE_PROJECT_PATH}' 
+PROJECT_FILE_PATH = '{PROJECT_FILE_PATH}'
 
-# Process template path and project file path
-try:
-    TEMPLATE_PROJECT_PATH = extract_path(TEMPLATE_PROJECT_PATH_RAW)
-    PROJECT_FILE_PATH = extract_path(PROJECT_FILE_PATH_RAW)
-    print("DEBUG: Processed paths:")
-    print("DEBUG: TEMPLATE_PROJECT_PATH_RAW: %s" % TEMPLATE_PROJECT_PATH_RAW)
-    print("DEBUG: TEMPLATE_PROJECT_PATH (processed): %s" % TEMPLATE_PROJECT_PATH)
-    print("DEBUG: PROJECT_FILE_PATH_RAW: %s" % PROJECT_FILE_PATH_RAW)
-    print("DEBUG: PROJECT_FILE_PATH (processed): %s" % PROJECT_FILE_PATH)
-except Exception as path_proc_err:
-    print("CRITICAL: Error processing path variables: %s" % path_proc_err)
-    traceback.print_exc()
+# Print raw paths for debugging
+print("DEBUG: Template path (raw): %s" % repr(TEMPLATE_PROJECT_PATH))
+print("DEBUG: Project path (raw): %s" % repr(PROJECT_FILE_PATH))
 
 print("DEBUG: Processed TEMPLATE_PROJECT_PATH: %s" % TEMPLATE_PROJECT_PATH)
 print("DEBUG: Processed PROJECT_FILE_PATH: %s" % PROJECT_FILE_PATH)

package/dist/scripts/start_session.py

@@ -387,6 +387,7 @@ def check_command():
                 
                 # Execute the command
                 print("Executing command: {0}".format(command.get("type", "unknown")))
+                sys.stdout.flush()  # Ensure output is flushed before potentially long-running operation
                 result, stop_requested = execute_command(command)
                 print("Command execution complete, stop_requested: {0}".format(stop_requested))
                 
@@ -423,6 +424,7 @@ def check_command():
             except Exception as cmd_err:
                 print("Error processing command: {0}".format(cmd_err))
                 traceback.print_exc()
+                sys.stdout.flush()  # Ensure error output is flushed
                 
                 # Try to reset the command file
                 try:
@@ -448,6 +450,7 @@ def check_command():
     except Exception as e:
         print("Error in check_command: {0}".format(e))
         traceback.print_exc()
+        sys.stdout.flush()  # Ensure error output is flushed
         return False
 
 def update_last_activity():
@@ -497,6 +500,7 @@ def command_loop():
     print("Session state file: {0}".format(SESSION_STATE_FILE))
     print("Poll interval: {0} seconds".format(POLL_INTERVAL))
     print("Max inactivity time: {0} seconds".format(MAX_INACTIVITY_TIME))
+    sys.stdout.flush()  # Ensure initialization output is visible immediately
     
     # Set up initial session state files
     try:
@@ -519,9 +523,14 @@ def command_loop():
                     "timestamp": time.time()
                 }, f, indent=2)
             print("Created initial result file")
+            sys.stdout.flush()
     except Exception as setup_err:
         print("Error setting up initial files: {0}".format(setup_err))
         traceback.print_exc()
+        sys.stdout.flush()
+    
+    print("Entering main command loop...")
+    sys.stdout.flush()
     
     while not stop_requested:
         try:
@@ -536,24 +545,27 @@ def command_loop():
             if current_time - last_heartbeat > 60:
                 print("Command loop heartbeat - still alive (iteration {0})".format(loop_count))
                 last_heartbeat = current_time
+                sys.stdout.flush()
             
             # Check for new commands
-            print("Checking for commands...")
             stop_requested = check_command()
             if stop_requested:
                 print("Stop was requested by a command")
+                sys.stdout.flush()
             
             # Check for inactivity timeout
             if check_inactivity_timeout():
                 print("Session timeout due to inactivity")
                 update_session_state("timeout")
                 stop_requested = True
+                sys.stdout.flush()
                 
             # Periodically update session state (every 30 seconds)
             if (current_time - last_state_update) > 30:
                 print("Periodic session state update")
                 update_session_state()
                 last_state_update = current_time
+                sys.stdout.flush()
             
             # Sleep for a bit
             time.sleep(POLL_INTERVAL)
@@ -561,34 +573,48 @@ def command_loop():
         except Exception as e:
             print("Error in command loop: {0}".format(e))
             traceback.print_exc()
+            sys.stdout.flush()
             # Sleep for a bit before retrying
             time.sleep(POLL_INTERVAL)
     
     print("Command loop stopped after {0} iterations".format(loop_count))
+    sys.stdout.flush()
 
 # Main script
 def main():
     try:
+        print("Starting CODESYS automation session...")
+        sys.stdout.flush()
+        
         # Setup session directory and files
+        print("Setting up session directory...")
+        sys.stdout.flush()
         if not setup_session_dir():
+            print("Failed to set up session directory")
+            sys.stdout.flush()
             sys.exit(1)
         
         # Update initial session state
+        print("Updating initial session state...")
+        sys.stdout.flush()
         update_session_state()
         
         # Start command loop
         print("{0}: CODESYS session started".format(SCRIPT_SUCCESS_MARKER))
+        sys.stdout.flush()
         command_loop()
         
         # Update final state
         update_session_state("stopped")
         
         print("{0}: CODESYS session stopped cleanly".format(SCRIPT_SUCCESS_MARKER))
+        sys.stdout.flush()
         sys.exit(0)
     except Exception as e:
         print("Error in session: {0}".format(e))
         print("{0}: Session failed - {1}".format(SCRIPT_ERROR_MARKER, str(e)))
         traceback.print_exc()
+        sys.stdout.flush()
         sys.exit(1)
 
 if __name__ == "__main__":

package/dist/server.js

@@ -130,7 +130,7 @@ function startMcpServer(config) {
         console.error("SERVER.TS: Initializing McpServer...");
         const server = new mcp_js_1.McpServer({
             name: "CODESYS Control MCP Server",
-            version: "1.8.0", // Updated version for refactored code
+            version: "1.8.1", // Updated version for session fixes
             capabilities: {
                 resources: { listChanged: true },
                 tools: { listChanged: true }
@@ -372,9 +372,13 @@ function startMcpServer(config) {
             try {
                 // Load script template and interpolate parameters
                 const scriptTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('create_project');
+                // Normalize paths for more consistent handling between platforms
+                const normalizedTargetPath = absPath.replace(/\\/g, '/');
+                const normalizedTemplatePath = templatePath.replace(/\\/g, '/');
+                console.error(`Using normalized paths for script: Target=${normalizedTargetPath}, Template=${normalizedTemplatePath}`);
                 const scriptContent = (0, scriptLoader_1.interpolateScript)(scriptTemplate, {
-                    'PROJECT_FILE_PATH': absPath.replace(/\\/g, '\\\\'),
-                    'TEMPLATE_PROJECT_PATH': templatePath.replace(/\\/g, '\\\\')
+                    'PROJECT_FILE_PATH': normalizedTargetPath,
+                    'TEMPLATE_PROJECT_PATH': normalizedTemplatePath
                 });
                 console.error(">>> create_project (copy-then-open): PREPARED SCRIPT:", scriptContent.substring(0, 500) + "...");
                 const result = yield (0, codesys_interop_1.executeCodesysScript)(scriptContent, codesysExePath, codesysProfileName, sessionManager);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codesys/mcp-toolkit",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "description": "Model Context Protocol (MCP) server for CODESYS automation platform",
   "main": "dist/server.js",
   "bin": {