fix(core): resolve macOS issues in 1.4.0-alpha — deadlock, GhJSON validation, and JSON parsing

CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- fix(core): fire `ComponentStateManager` transition events outside `stateLock` using `Monitor.Exit`/`Monitor.Enter` to prevent deadlocks from re-entrant lock acquisition on macOS (adapted to 1.4.0 code structure)
+- fix(infrastructure): skip SHA-256 hash verification on non-Windows platforms where source-built assemblies produce different hashes than official releases
+- fix(tools): set GhJSON component `Id = 1` when `InstanceGuid` is null in `script_generate` and `script_edit` to satisfy GhJSON.Core validation requiring at least one identifier
+- fix(tools): add `SanitizeAndParseJson` to handle AI responses wrapped in markdown code blocks or non-JSON formatting in `script_generate` and `script_edit`
+- fix(infrastructure): improve `AIProvider.CallApi()` error messages for non-JSON API responses (e.g., HTML error pages from proxies)
+
 ## [1.4.0-alpha] - 2026-02-15
 
 Many thanks to [nofcfy-fanqi](https://github.com/nofcfy-fanqi) and [nof2504](https://github.com/nof2504) for the contributions to this release.

src/SmartHopper.Core.Grasshopper/AITools/script_edit.cs

@@ -24,8 +24,10 @@
 using GhJSON.Core;
 using GhJSON.Core.SchemaModels;
 using GhJSON.Core.Serialization;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using SmartHopper.Core.Grasshopper.Utils.Constants;
+using SmartHopper.Core.Grasshopper.Utils.Parsing;
 using SmartHopper.Infrastructure.AICall.Core.Base;
 using SmartHopper.Infrastructure.AICall.Core.Interactions;
 using SmartHopper.Infrastructure.AICall.Core.Requests;
@@ -242,7 +244,7 @@ private async Task<AIReturn> ExecuteAsync(AIToolCall toolCall)
 
                 // Parse AI response and validate with retry loop
                 var response = result.Body.GetLastInteraction(AIAgent.Assistant).ToString();
-                var responseJson = JObject.Parse(response);
+                var responseJson = SanitizeAndParseJson(response);
 
                 var newScriptCode = responseJson["script"]?.ToString() ?? string.Empty;
                 var newInputs = responseJson["inputs"] as JArray ?? new JArray();
@@ -289,7 +291,7 @@ private async Task<AIReturn> ExecuteAsync(AIToolCall toolCall)
 
                     // Parse corrected response
                     response = correctionResult.Body.GetLastInteraction(AIAgent.Assistant).ToString();
-                    responseJson = JObject.Parse(response);
+                    responseJson = SanitizeAndParseJson(response);
 
                     newScriptCode = responseJson["script"]?.ToString() ?? string.Empty;
                     newInputs = responseJson["inputs"] as JArray ?? new JArray();
@@ -397,6 +399,15 @@ private static string GetExtensionKey(string languageKey)
             };
         }
 
+        /// <summary>
+        /// Sanitizes and parses an AI response as a JSON object.
+        /// Delegates to <see cref="AIResponseParser.SanitizeAndParseJson"/>.
+        /// </summary>
+        private static JObject SanitizeAndParseJson(string response)
+        {
+            return AIResponseParser.SanitizeAndParseJson(response);
+        }
+
         private static string CreateScriptGhJson(
             string languageKey,
             string scriptCode,
@@ -421,6 +432,7 @@ private static string CreateScriptGhJson(
                 },
                 NickName = nickname,
                 InstanceGuid = instanceGuid,
+                Id = instanceGuid.HasValue ? null : 1,
                 Pivot = pivot,
             };
 

src/SmartHopper.Core.Grasshopper/AITools/script_generate.cs

@@ -28,6 +28,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using SmartHopper.Core.Grasshopper.Utils.Constants;
+using SmartHopper.Core.Grasshopper.Utils.Parsing;
 using SmartHopper.Infrastructure.AICall.Core.Base;
 using SmartHopper.Infrastructure.AICall.Core.Interactions;
 using SmartHopper.Infrastructure.AICall.Core.Requests;
@@ -215,7 +216,7 @@ private async Task<AIReturn> ExecuteAsync(AIToolCall toolCall)
 
                 // Parse AI response and validate with retry loop
                 var response = result.Body.GetLastInteraction(AIAgent.Assistant).ToString();
-                var responseJson = JObject.Parse(response);
+                var responseJson = SanitizeAndParseJson(response);
 
                 var language = responseJson["language"]?.ToString() ?? "python";
                 var scriptCode = responseJson["script"]?.ToString() ?? string.Empty;
@@ -266,7 +267,7 @@ private async Task<AIReturn> ExecuteAsync(AIToolCall toolCall)
 
                     // Parse corrected response
                     response = correctionResult.Body.GetLastInteraction(AIAgent.Assistant).ToString();
-                    responseJson = JObject.Parse(response);
+                    responseJson = SanitizeAndParseJson(response);
 
                     scriptCode = responseJson["script"]?.ToString() ?? string.Empty;
                     inputs = responseJson["inputs"] as JArray ?? new JArray();
@@ -364,6 +365,15 @@ private static string GetExtensionKey(string languageKey)
             };
         }
 
+        /// <summary>
+        /// Sanitizes and parses an AI response as a JSON object.
+        /// Delegates to <see cref="AIResponseParser.SanitizeAndParseJson"/>.
+        /// </summary>
+        private static JObject SanitizeAndParseJson(string response)
+        {
+            return AIResponseParser.SanitizeAndParseJson(response);
+        }
+
         private static string CreateComponentName(string languageKey)
         {
             return languageKey?.Trim().ToLowerInvariant() switch
@@ -393,6 +403,7 @@ private static string CreateScriptGhJson(
                 Name = CreateComponentName(languageKey),
                 NickName = nickname,
                 InstanceGuid = instanceGuid,
+                Id = instanceGuid.HasValue ? null : 1,
                 Pivot = pivot,
             };
 

src/SmartHopper.Core.Grasshopper/Utils/Parsing/AIResponseParser.cs

@@ -16,6 +16,7 @@
  * along with this library; if not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.
  */
 
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -545,5 +546,145 @@ public static string NormalizeJsonArrayString(List<string> values)
         }
 
         #endregion
+
+        #region JSON Object Parsing
+
+        /// <summary>
+        /// Attempts to extract and parse a JSON object from an AI response that may contain
+        /// markdown formatting, HTML tags, or other non-JSON wrapping.
+        /// Uses brace-depth tracking to correctly extract the first complete JSON object.
+        /// </summary>
+        /// <param name="response">Raw response from the AI.</param>
+        /// <returns>Parsed <see cref="JObject"/>.</returns>
+        /// <exception cref="JsonException">Thrown when the response cannot be parsed as JSON.</exception>
+        public static JObject SanitizeAndParseJson(string response)
+        {
+            if (string.IsNullOrWhiteSpace(response))
+            {
+                throw new JsonException("AI response is empty.");
+            }
+
+            // Try direct parse first
+            try
+            {
+                return JObject.Parse(response);
+            }
+            catch (JsonException)
+            {
+                // Continue with sanitization attempts
+            }
+
+            // Try extracting JSON from markdown code blocks (```json ... ``` or ``` ... ```)
+            var trimmed = response.Trim();
+            var match = MarkdownCodeBlockRegex().Match(trimmed);
+            if (match.Success)
+            {
+                try
+                {
+                    return JObject.Parse(match.Groups[1].Value.Trim());
+                }
+                catch (JsonException)
+                {
+                    // Continue
+                }
+            }
+
+            // Try extracting the first complete JSON object by tracking brace depth
+            var jsonCandidate = ExtractFirstJsonObject(trimmed);
+            if (!string.IsNullOrEmpty(jsonCandidate))
+            {
+                try
+                {
+                    return JObject.Parse(jsonCandidate);
+                }
+                catch (JsonException)
+                {
+                    // Continue
+                }
+            }
+
+            // All attempts failed - provide a descriptive error
+            var preview = response.Length > 200 ? response.Substring(0, 200) + "..." : response;
+            if (trimmed.StartsWith("<", StringComparison.Ordinal))
+            {
+                throw new JsonException(
+                    $"AI returned HTML/XML instead of JSON. This may indicate a provider error. Preview: {preview}");
+            }
+
+            throw new JsonException($"AI response is not valid JSON. Preview: {preview}");
+        }
+
+        /// <summary>
+        /// Extracts the first complete JSON object from a string by tracking brace depth,
+        /// correctly handling nested objects and string literals.
+        /// </summary>
+        /// <param name="text">The text to search for a JSON object.</param>
+        /// <returns>The first complete JSON object string, or null if none found.</returns>
+        private static string ExtractFirstJsonObject(string text)
+        {
+            if (string.IsNullOrEmpty(text))
+            {
+                return null;
+            }
+
+            bool inString = false;
+            bool escape = false;
+            int depth = 0;
+            int startIndex = -1;
+
+            for (int i = 0; i < text.Length; i++)
+            {
+                char c = text[i];
+
+                if (escape)
+                {
+                    escape = false;
+                    continue;
+                }
+
+                if (c == '\\')
+                {
+                    if (inString)
+                    {
+                        escape = true;
+                    }
+
+                    continue;
+                }
+
+                if (c == '"')
+                {
+                    inString = !inString;
+                    continue;
+                }
+
+                if (inString)
+                {
+                    continue;
+                }
+
+                if (c == '{')
+                {
+                    if (depth == 0)
+                    {
+                        startIndex = i;
+                    }
+
+                    depth++;
+                }
+                else if (c == '}' && depth > 0)
+                {
+                    depth--;
+                    if (depth == 0 && startIndex >= 0)
+                    {
+                        return text.Substring(startIndex, i - startIndex + 1);
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        #endregion
     }
 }

src/SmartHopper.Core/ComponentBase/ComponentStateManager.cs

@@ -353,31 +353,48 @@ private void ProcessTransitionQueue()
             // Collect all transition results inside the lock in one pass
             var pendingEvents = new List<(ComponentState oldState, ComponentState newState, bool isRejection, string rejectionMessage)>();
 
-            while (this.pendingTransitions.Count > 0)
+            try
             {
-                var request = this.pendingTransitions.Dequeue();
-                var result = this.ExecuteTransitionCore(request);
-                if (result.HasValue)
+                while (this.pendingTransitions.Count > 0)
                 {
-                    pendingEvents.Add(result.Value);
+                    var request = this.pendingTransitions.Dequeue();
+                    var result = this.ExecuteTransitionCore(request);
+                    if (result.HasValue)
+                    {
+                        pendingEvents.Add(result.Value);
+                    }
                 }
             }
+            finally
+            {
+                // Clear transitioning flag BEFORE releasing lock to prevent race conditions
+                this.isTransitioning = false;
+            }
 
-            // Clear transitioning flag BEFORE releasing lock to prevent race conditions
-            this.isTransitioning = false;
-
-            // Fire all events outside the lock
-            // Event handlers may call RequestTransition(), which will queue new transitions
-            // for the next ProcessTransitionQueue() call
-            foreach (var evt in pendingEvents)
+            // Fire all events TRULY outside the lock by temporarily releasing stateLock.
+            // This method is called from within lock(stateLock) in RequestTransition(),
+            // so we must explicitly exit/re-enter the monitor to prevent re-entrant
+            // deadlocks when event handlers call back into RequestTransition().
+            if (pendingEvents.Count > 0)
             {
-                if (evt.isRejection)
+                System.Threading.Monitor.Exit(this.stateLock);
+                try
                 {
-                    this.TransitionRejected?.Invoke(evt.oldState, evt.newState, evt.rejectionMessage);
+                    foreach (var evt in pendingEvents)
+                    {
+                        if (evt.isRejection)
+                        {
+                            this.TransitionRejected?.Invoke(evt.oldState, evt.newState, evt.rejectionMessage);
+                        }
+                        else
+                        {
+                            this.FireTransitionEvents(evt.oldState, evt.newState);
+                        }
+                    }
                 }
-                else
+                finally
                 {
-                    this.FireTransitionEvents(evt.oldState, evt.newState);
+                    System.Threading.Monitor.Enter(this.stateLock);
                 }
             }
         }

src/SmartHopper.Infrastructure/AIProviders/AIProvider.cs

@@ -771,7 +771,19 @@ private async Task<IAIReturn> CallApi(AIRequestCall request)
                     catch (Exception ex)
                     {
                         Debug.WriteLine($"[{this.Name}] Call - Failed to parse JSON response: {ex.Message}");
-                        throw;
+
+                        // Provide a more useful error when the API returns non-JSON content (e.g., HTML error pages)
+                        var preview = content?.Length > 200 ? content.Substring(0, 200) + "..." : content;
+                        if (!string.IsNullOrEmpty(content) && content.TrimStart().StartsWith("<", StringComparison.Ordinal))
+                        {
+                            throw new Exception(
+                                $"The {this.Name} API returned an HTML response instead of JSON. " +
+                                $"This usually indicates a server error, proxy issue, or Cloudflare challenge. " +
+                                $"Response preview: {preview}");
+                        }
+
+                        throw new Exception(
+                            $"The {this.Name} API returned invalid JSON. Response preview: {preview}", ex);
                     }
 
                     var aiReturn = new AIReturn();