Merge branch 'master' into tyler/update-nativeaot-llvm-infrastructure

Author: rekhoff

Cargo.lock

@@ -108,46 +108,46 @@ inherits = "release"
 debug = true
 
 [workspace.package]
-version = "2.0.4"
+version = "2.0.5"
 edition = "2024"
 # update rust-toolchain.toml too!
 rust-version = "1.93.0"
 
 [workspace.dependencies]
-spacetimedb = { path = "crates/bindings", version = "=2.0.4" }
-spacetimedb-auth = { path = "crates/auth", version = "=2.0.4" }
-spacetimedb-bindings-macro = { path = "crates/bindings-macro", version = "=2.0.4" }
-spacetimedb-bindings-sys = { path = "crates/bindings-sys", version = "=2.0.4" }
-spacetimedb-cli = { path = "crates/cli", version = "=2.0.4" }
-spacetimedb-client-api = { path = "crates/client-api", version = "=2.0.4" }
-spacetimedb-client-api-messages = { path = "crates/client-api-messages", version = "=2.0.4" }
-spacetimedb-codegen = { path = "crates/codegen", version = "=2.0.4" }
-spacetimedb-commitlog = { path = "crates/commitlog", version = "=2.0.4" }
-spacetimedb-core = { path = "crates/core", version = "=2.0.4" }
-spacetimedb-data-structures = { path = "crates/data-structures", version = "=2.0.4" }
-spacetimedb-datastore = { path = "crates/datastore", version = "=2.0.4" }
-spacetimedb-durability = { path = "crates/durability", version = "=2.0.4" }
-spacetimedb-execution = { path = "crates/execution", version = "=2.0.4" }
-spacetimedb-expr = { path = "crates/expr", version = "=2.0.4" }
-spacetimedb-guard = { path = "crates/guard", version = "=2.0.4" }
-spacetimedb-lib = { path = "crates/lib", default-features = false, version = "=2.0.4" }
-spacetimedb-memory-usage = { path = "crates/memory-usage", version = "=2.0.4", default-features = false }
-spacetimedb-metrics = { path = "crates/metrics", version = "=2.0.4" }
-spacetimedb-paths = { path = "crates/paths", version = "=2.0.4" }
-spacetimedb-pg = { path = "crates/pg", version = "=2.0.4" }
-spacetimedb-physical-plan = { path = "crates/physical-plan", version = "=2.0.4" }
-spacetimedb-primitives = { path = "crates/primitives", version = "=2.0.4" }
-spacetimedb-query = { path = "crates/query", version = "=2.0.4" }
-spacetimedb-sats = { path = "crates/sats", version = "=2.0.4" }
-spacetimedb-schema = { path = "crates/schema", version = "=2.0.4" }
-spacetimedb-standalone = { path = "crates/standalone", version = "=2.0.4" }
-spacetimedb-sql-parser = { path = "crates/sql-parser", version = "=2.0.4" }
-spacetimedb-table = { path = "crates/table", version = "=2.0.4" }
-spacetimedb-vm = { path = "crates/vm", version = "=2.0.4" }
-spacetimedb-fs-utils = { path = "crates/fs-utils", version = "=2.0.4" }
-spacetimedb-snapshot = { path = "crates/snapshot", version = "=2.0.4" }
-spacetimedb-subscription = { path = "crates/subscription", version = "=2.0.4" }
-spacetimedb-query-builder = { path = "crates/query-builder", version = "=2.0.4" }
+spacetimedb = { path = "crates/bindings", version = "=2.0.5" }
+spacetimedb-auth = { path = "crates/auth", version = "=2.0.5" }
+spacetimedb-bindings-macro = { path = "crates/bindings-macro", version = "=2.0.5" }
+spacetimedb-bindings-sys = { path = "crates/bindings-sys", version = "=2.0.5" }
+spacetimedb-cli = { path = "crates/cli", version = "=2.0.5" }
+spacetimedb-client-api = { path = "crates/client-api", version = "=2.0.5" }
+spacetimedb-client-api-messages = { path = "crates/client-api-messages", version = "=2.0.5" }
+spacetimedb-codegen = { path = "crates/codegen", version = "=2.0.5" }
+spacetimedb-commitlog = { path = "crates/commitlog", version = "=2.0.5" }
+spacetimedb-core = { path = "crates/core", version = "=2.0.5" }
+spacetimedb-data-structures = { path = "crates/data-structures", version = "=2.0.5" }
+spacetimedb-datastore = { path = "crates/datastore", version = "=2.0.5" }
+spacetimedb-durability = { path = "crates/durability", version = "=2.0.5" }
+spacetimedb-execution = { path = "crates/execution", version = "=2.0.5" }
+spacetimedb-expr = { path = "crates/expr", version = "=2.0.5" }
+spacetimedb-guard = { path = "crates/guard", version = "=2.0.5" }
+spacetimedb-lib = { path = "crates/lib", default-features = false, version = "=2.0.5" }
+spacetimedb-memory-usage = { path = "crates/memory-usage", version = "=2.0.5", default-features = false }
+spacetimedb-metrics = { path = "crates/metrics", version = "=2.0.5" }
+spacetimedb-paths = { path = "crates/paths", version = "=2.0.5" }
+spacetimedb-pg = { path = "crates/pg", version = "=2.0.5" }
+spacetimedb-physical-plan = { path = "crates/physical-plan", version = "=2.0.5" }
+spacetimedb-primitives = { path = "crates/primitives", version = "=2.0.5" }
+spacetimedb-query = { path = "crates/query", version = "=2.0.5" }
+spacetimedb-sats = { path = "crates/sats", version = "=2.0.5" }
+spacetimedb-schema = { path = "crates/schema", version = "=2.0.5" }
+spacetimedb-standalone = { path = "crates/standalone", version = "=2.0.5" }
+spacetimedb-sql-parser = { path = "crates/sql-parser", version = "=2.0.5" }
+spacetimedb-table = { path = "crates/table", version = "=2.0.5" }
+spacetimedb-vm = { path = "crates/vm", version = "=2.0.5" }
+spacetimedb-fs-utils = { path = "crates/fs-utils", version = "=2.0.5" }
+spacetimedb-snapshot = { path = "crates/snapshot", version = "=2.0.5" }
+spacetimedb-subscription = { path = "crates/subscription", version = "=2.0.5" }
+spacetimedb-query-builder = { path = "crates/query-builder", version = "=2.0.5" }
 
 # Prevent `ahash` from pulling in `getrandom` by disabling default features.
 # Modules use `getrandom02` and we need to prevent an incompatible version

Cargo.toml

@@ -5,7 +5,7 @@ Business Source License 1.1
 Parameters
 
 Licensor:             Clockwork Laboratories, Inc.
-Licensed Work:        SpacetimeDB 2.0.4
+Licensed Work:        SpacetimeDB 2.0.5
                       The Licensed Work is
                       (c) 2023 Clockwork Laboratories, Inc.
 
@@ -21,7 +21,7 @@ Additional Use Grant: You may make use of the Licensed Work provided your
                       Licensed Work by creating tables whose schemas are
                       controlled by such third parties.
 
-Change Date:          2031-03-10
+Change Date:          2031-03-12
 
 Change License:       GNU Affero General Public License v3.0 with a linking
                       exception

LICENSE.txt

@@ -39,6 +39,7 @@ Unit F64
     )>
 {
     public static readonly AlgebraicType Unit = new Product([]);
+    public const string QueryBuilderProductTypeTag = "__query__";
 
     // Special AlgebraicType that can be recognised by the SpacetimeDB `generate` CLI as an Option<T>.
     internal static AlgebraicType MakeOption(AlgebraicType someType) =>
@@ -47,4 +48,8 @@ internal static AlgebraicType MakeOption(AlgebraicType someType) =>
     // Special AlgebraicType that can be recognised by the SpacetimeDB `generate` CLI as a Result<T, E>.
     internal static AlgebraicType MakeResult(AlgebraicType okType, AlgebraicType errType) =>
         new Sum([new("ok", okType), new("err", errType)]);
+
+    // Special AlgebraicType that can be recognised by the SpacetimeDB `generate` CLI as Query<T>.
+    public static AlgebraicType MakeQueryBuilderProductType(Ref rowProductTypeRef) =>
+        new Product([new(QueryBuilderProductTypeTag, rowProductTypeRef)]);
 }

crates/bindings-csharp/BSATN.Runtime/BSATN/AlgebraicType.cs

@@ -1636,10 +1636,9 @@ SpacetimeDB.BSATN.ITypeRegistrar registrar
             IsPublic: true,
             IsAnonymous: false,
             Params: [],
-            ReturnType: new SpacetimeDB.BSATN.ValueOption<
-                PublicTable,
-                PublicTable.BSATN
-            >().GetAlgebraicType(registrar)
+            ReturnType: global::SpacetimeDB.BSATN.AlgebraicType.MakeQueryBuilderProductType(
+                new PublicTable.BSATN().GetAlgebraicType(registrar)
+            )
         );
 
     public byte[] Invoke(

crates/bindings-csharp/Codegen.Tests/fixtures/server/snapshots/Module#FFI.verified.cs

@@ -1122,6 +1122,7 @@ record ViewDeclaration
     public readonly bool IsPublic;
     public readonly bool ReturnsQuery;
     public readonly TypeUse ReturnType;
+    public readonly TypeUse? QueryRowType;
     public readonly EquatableArray<MemberDeclaration> Parameters;
     public readonly Scope Scope;
 
@@ -1186,15 +1187,12 @@ method.ReturnType is INamedTypeSymbol
         {
             ReturnsQuery = true;
             var rowType = TypeUse.Parse(method, queryRowType, diag);
-            var optType = queryRowType.IsValueType
-                ? "SpacetimeDB.BSATN.ValueOption"
-                : "SpacetimeDB.BSATN.RefOption";
-            var opt = $"{optType}<{rowType.Name}, {rowType.BSATNName}>";
-            // Match Rust semantics: Query<T> is described as a nullable row (T?).
-            ReturnType = new ReferenceUse(opt, opt);
+            QueryRowType = rowType;
+            ReturnType = rowType;
         }
         else
         {
+            QueryRowType = null;
             ReturnType = TypeUse.Parse(method, method.ReturnType, diag);
         }
         Scope = new Scope(methodSyntax.Parent as MemberDeclarationSyntax);
@@ -1211,9 +1209,10 @@ method.ReturnType is INamedTypeSymbol
             diag.Report(ErrorDescriptor.ViewContextParam, methodSyntax);
         }
 
-        // Validate return type: must be List<T> or T?
+        // Validate return type: must be List<T>, T?, or IQuery<T>.
         if (
-            !ReturnType.BSATNName.Contains("SpacetimeDB.BSATN.ValueOption")
+            !ReturnsQuery
+            && !ReturnType.BSATNName.Contains("SpacetimeDB.BSATN.ValueOption")
             && !ReturnType.BSATNName.Contains("SpacetimeDB.BSATN.RefOption")
             && !ReturnType.BSATNName.Contains("SpacetimeDB.BSATN.List")
         )
@@ -1229,17 +1228,22 @@ method.ReturnType is INamedTypeSymbol
         );
     }
 
-    public string GenerateViewDef(uint Index) =>
-        $$$"""
+    public string GenerateViewDef(uint Index)
+    {
+        var returnTypeExpr = ReturnsQuery
+            ? $"global::SpacetimeDB.BSATN.AlgebraicType.MakeQueryBuilderProductType(new {QueryRowType!.BSATNName}().GetAlgebraicType(registrar))"
+            : $"new {ReturnType.BSATNName}().GetAlgebraicType(registrar)";
+        return $$$"""
             new global::SpacetimeDB.Internal.RawViewDefV10(
                 SourceName: "{{{Name}}}",
                 Index: {{{Index}}},
                 IsPublic: {{{IsPublic.ToString().ToLower()}}},
                 IsAnonymous: {{{IsAnonymous.ToString().ToLower()}}},
                 Params: [{{{MemberDeclaration.GenerateDefs(Parameters)}}}],
-                ReturnType: new {{{ReturnType.BSATNName}}}().GetAlgebraicType(registrar)
+                ReturnType: {{{returnTypeExpr}}}
             );
             """;
+    }
 
     /// <summary>
     /// Generates the class responsible for evaluating a view.

crates/bindings-csharp/Codegen/Module.cs

@@ -653,6 +653,13 @@ impl Lang for Csharp<'_> {
                 }
             }
         }
+        for (columns, constraints) in schema.backcompat_column_constraints() {
+            if constraints.has_indexed() || constraints.has_unique() || constraints.has_primary_key() {
+                for col_pos in columns.iter() {
+                    ix_col_positions.insert(col_pos.idx());
+                }
+            }
+        }
 
         writeln!(output, "public sealed class {cols_owner_name}Cols");
         indented_block(&mut output, |output| {

crates/codegen/src/csharp.rs

@@ -289,7 +289,7 @@ const proceduresSchema = __procedures(
 /** The remote SpacetimeDB module schema, both runtime and type information. */
 const REMOTE_MODULE = {
   versionInfo: {
-    cliVersion: "2.0.4" as const,
+    cliVersion: "2.0.5" as const,
   },
   tables: tablesSchema.schemaType.tables,
   reducers: reducersSchema.reducersType.reducers,

crates/codegen/tests/snapshots/codegen__codegen_typescript.snap

@@ -970,12 +970,16 @@ impl InstanceEnv {
 
 /// Default timeout for HTTP requests performed by [`InstanceEnv::http_request`].
 ///
-/// Value chosen arbitrarily by pgoldman 2025-11-18, based on little more than a vague guess.
-const HTTP_DEFAULT_TIMEOUT: Duration = Duration::from_millis(500);
+/// Applied when the module does not specify a timeout.
+/// 30 seconds is generous enough for most external API calls (including LLM APIs)
+/// without silently hanging forever on a broken endpoint.
+const HTTP_DEFAULT_TIMEOUT: Duration = Duration::from_secs(30);
 /// Maximum timeout for HTTP requests performed by [`InstanceEnv::http_request`].
 ///
 /// If the user requests a timeout longer than this, we will clamp to this value.
-const HTTP_MAX_TIMEOUT: Duration = Duration::from_secs(10);
+/// 180 seconds accommodates long-running LLM and AI API calls,
+/// which routinely take 30-120 seconds for complex requests.
+const HTTP_MAX_TIMEOUT: Duration = Duration::from_secs(180);
 const BLOCKED_HTTP_ADDRESS_ERROR: &str = "refusing to connect to private or special-purpose addresses";
 
 struct FilteredDnsResolver;