Merge pull request #34 from semantic-developer/feature/sd-36

feature/sd-36

Author: johnabbott72

SemanticDeveloper/Installers/Linux/build_deb.sh

@@ -8,7 +8,7 @@ APP_PROJ="$ROOT/SemanticDeveloper/SemanticDeveloper.csproj"
 PUBLISH_DIR="$SCRIPT_DIR/out/publish"
 PKG_ROOT="$SCRIPT_DIR/pkgroot"
 DIST_DIR="$SCRIPT_DIR/dist"
-VERSION="1.0.7"
+VERSION="1.0.8"
 ARCH="amd64"
 if [[ "$RID" == "linux-arm64" ]]; then ARCH="arm64"; fi
 

SemanticDeveloper/Installers/Linux/dist/semantic-developer_1.0.8_amd64.deb

@@ -6,7 +6,7 @@
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-        <Version>1.0.7</Version>
+        <Version>1.0.8</Version>
         <Copyright>2025 Stainless Designer LLC</Copyright>
     </PropertyGroup>
 

SemanticDeveloper/SemanticDeveloper/SemanticDeveloper.csproj

@@ -111,6 +111,7 @@ public partial class SessionView : UserControl, INotifyPropertyChanged
     private const long ContextBaselineTokens = 12000;
     private static readonly string[] FileTreeIgnoredFolders = new[] { ".git", "node_modules", "bin", "obj", ".idea", ".vs" };
     private bool _verboseLogging;
+    private bool _modelListUseLegacyPaging;
     private bool _mcpEnabled;
     private bool _allowNetworkAccess;
     private bool _loginInProgress;
@@ -644,19 +645,39 @@ private async Task<List<ModelCatalogEntry>> FetchModelCatalogAsync()
 
         while (true)
         {
-            var parameters = new JObject
+            var parameters = new JObject();
+            if (_modelListUseLegacyPaging)
             {
-                ["limit"] = PageSize,
-                ["pageSize"] = PageSize // legacy field for older Codex builds
-            };
+                parameters["pageSize"] = PageSize;
+            }
+            else
+            {
+                parameters["limit"] = PageSize;
+                parameters["pageSize"] = PageSize; // fallback for older builds; ignored by newer ones
+            }
+
             if (!string.IsNullOrWhiteSpace(cursor))
                 parameters["cursor"] = cursor;
 
-            var response = await SendRequestAsync("model/list", parameters).ConfigureAwait(false);
-            if (response is not JObject obj)
-                break;
+            JObject obj;
+            try
+            {
+                var response = await SendRequestAsync("model/list", parameters).ConfigureAwait(false);
+                if (response is not JObject json)
+                    break;
+                obj = json;
+            }
+            catch (Exception ex) when (ShouldFallbackToLegacyModelList(ex))
+            {
+                if (_modelListUseLegacyPaging)
+                    throw;
+                _modelListUseLegacyPaging = true;
+                AppendCliLog("System: CLI returned legacy pagination error; retrying model catalog request.");
+                return await FetchModelCatalogAsync().ConfigureAwait(false);
+            }
 
-            if (obj["items"] is JArray items)
+            var itemsToken = obj["items"] ?? obj["data"];
+            if (itemsToken is JArray items)
             {
                 foreach (var token in items.OfType<JObject>())
                 {
@@ -666,7 +687,7 @@ private async Task<List<ModelCatalogEntry>> FetchModelCatalogAsync()
                 }
             }
 
-            var nextCursor = obj["nextCursor"]?.ToString();
+            var nextCursor = obj["nextCursor"]?.ToString() ?? obj["next_cursor"]?.ToString();
             if (string.IsNullOrWhiteSpace(nextCursor))
                 break;
             cursor = nextCursor;
@@ -3463,6 +3484,14 @@ private static bool IsPathAncestorOrSame(string? ancestor, string? target)
         return separator == Path.DirectorySeparatorChar || separator == Path.AltDirectorySeparatorChar;
     }
 
+    private static bool ShouldFallbackToLegacyModelList(Exception ex)
+    {
+        if (ex is not InvalidOperationException ioe)
+            return false;
+        var message = ioe.Message ?? string.Empty;
+        return message.IndexOf("invalid request", StringComparison.OrdinalIgnoreCase) >= 0;
+    }
+
     private void ResetEditorViewport(TextEditor? editor)
     {
         if (editor is null) return;