[bot/publish-github-release-after-steps]: Merge remote-tracking branch 'origin/master' into bot/publish-github-release-after-steps

Author: bfops

.github/actions/keynote-bench-setup/action.yml

@@ -19,6 +19,15 @@ runs:
       shell: bash
       run: rustup default $(rustup show active-toolchain | cut -d' ' -f1)
 
+    - name: Set up sccache
+      uses: mozilla-actions/sccache-action@v0.0.10
+
+    - name: Enable sccache
+      shell: bash
+      run: |
+        echo "SCCACHE_GHA_ENABLED=true" >>"$GITHUB_ENV"
+        echo "RUSTC_WRAPPER=sccache" >>"$GITHUB_ENV"
+
     - name: Cache Rust dependencies
       uses: Swatinem/rust-cache@v2
       with:

.github/workflows/ci.yml

@@ -110,6 +110,15 @@ jobs:
       - name: Set default rust toolchain
         run: rustup default $(rustup show active-toolchain | cut -d' ' -f1)
 
+      - name: Set up sccache
+        uses: mozilla-actions/sccache-action@v0.0.10
+
+      - name: Enable sccache
+        shell: bash
+        run: |
+          echo "SCCACHE_GHA_ENABLED=true" >>"$GITHUB_ENV"
+          echo "RUSTC_WRAPPER=sccache" >>"$GITHUB_ENV"
+
       - name: Cache Rust dependencies
         uses: Swatinem/rust-cache@v2
         with:
@@ -428,16 +437,24 @@ jobs:
       - name: Set default rust toolchain
         run: rustup default $(rustup show active-toolchain | cut -d' ' -f1)
 
+      - name: Set up sccache
+        uses: mozilla-actions/sccache-action@v0.0.10
+
+      - name: Enable sccache
+        run: |
+          echo "SCCACHE_GHA_ENABLED=true" >>"$GITHUB_ENV"
+          echo "RUSTC_WRAPPER=sccache" >>"$GITHUB_ENV"
+
       - name: Cache Rust dependencies
         uses: Swatinem/rust-cache@v2
         with:
           workspaces: ${{ github.workspace }}
-          shared-key: spacetimedb
-          save-if: false
+          shared-key: spacetimedb-index-scan
+          cache-on-failure: false
           prefix-key: v1
 
       - name: Run index scan benchmark regression check
-        run: cargo bench -p spacetimedb-bench --bench index_scan_gate
+        run: cargo run --release -p spacetimedb-index-scan-gate
 
   lints:
     needs: [merge_queue_noop]

.github/workflows/llm-benchmark-periodic.yml

@@ -113,7 +113,7 @@ jobs:
           ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
           LLM_VENDOR: openrouter
           LLM_BENCHMARK_API_KEY: ${{ secrets.LLM_BENCHMARK_API_KEY }}
-          LLM_BENCHMARK_UPLOAD_URL: ${{ inputs.LLM_BENCHMARK_UPLOAD_URL }}
+          LLM_BENCHMARK_UPLOAD_URL: ${{ vars.LLM_BENCHMARK_UPLOAD_URL }}
           DOTNET_MULTILEVEL_LOOKUP: "0"
           DOTNET_CLI_HOME: ${{ runner.temp }}/dotnet-home
           DOTNET_SKIP_FIRST_TIME_EXPERIENCE: "1"

.github/workflows/release.yml

@@ -54,7 +54,7 @@ permissions:
   packages: write
 
 concurrency:
-  group: manual-release
+  group: manual-release-${{ inputs.release_tag }}${{ inputs.dry_run && format('-dry-run-{0}', github.run_id) || '' }}
   cancel-in-progress: true
 
 jobs:

Cargo.lock

@@ -19,6 +19,7 @@ members = [
   "crates/expr",
   "crates/guard",
   "crates/fs-utils",
+  "crates/index-scan-gate",
   "crates/lib",
   "crates/metrics",
   "crates/paths",

Cargo.toml

@@ -30,10 +30,6 @@ harness = false
 name = "index"
 harness = false
 
-[[bench]]
-name = "index_scan_gate"
-harness = false
-
 [[bin]]
 name = "summarize"
 

crates/bench/Cargo.toml

@@ -202,6 +202,7 @@ fn discover_templates(templates_dir: &Path) -> Vec<TemplateInfo> {
         if !metadata_path.exists() {
             continue;
         }
+        println!("cargo:rerun-if-changed={}", metadata_path.display());
 
         let metadata_content = match fs::read_to_string(&metadata_path) {
             Ok(content) => content,
@@ -261,32 +262,7 @@ fn generate_template_entry(code: &mut String, template_path: &Path, source: &str
         panic!("Template '{}' has no git-tracked files! Check that the directory exists and contains files tracked by git.", source);
     }
 
-    // Example: /Users/user/SpacetimeDB
     let repo_root = get_repo_root();
-    let repo_root_canonical = std::fs::canonicalize(&repo_root).unwrap();
-    // Example: /Users/user/SpacetimeDB/crates/cli
-    let manifest_canonical = Path::new(manifest_dir).canonicalize().unwrap();
-    // Example: crates/cli
-    let manifest_rel = manifest_canonical.strip_prefix(&repo_root_canonical).unwrap();
-
-    // Example for inside crate: /Users/user/SpacetimeDB/crates/cli/templates/basic-rs/server
-    // Example for outside crate: /Users/user/SpacetimeDB/modules/chat-console-rs
-    let resolved_canonical = repo_root.join(&resolved_base).canonicalize().unwrap();
-
-    // If the files are outside of the cli crate we need to copy them to the crate directory,
-    // so they're included properly even when the crate is published
-    let local_copy_dir = if resolved_canonical.strip_prefix(&manifest_canonical).is_err() {
-        // Example source: "../../modules/quickstart-chat"
-        // Sanitized: "parent_parent_modules_quickstart-chat"
-        let sanitized_source = source.replace("/", "_").replace("\\", "_").replace("..", "parent");
-        // Example: /Users/user/SpacetimeDB/crates/cli/.templates/parent_parent_modules_quickstart-chat
-        let copy_dir = Path::new(manifest_dir).join(".templates").join(&sanitized_source);
-        fs::create_dir_all(&copy_dir).expect("Failed to create .templates directory");
-
-        Some(copy_dir)
-    } else {
-        None
-    };
 
     code.push_str("    {\n");
     code.push_str("        let mut files = HashMap::new();\n");
@@ -313,38 +289,13 @@ fn generate_template_entry(code: &mut String, template_path: &Path, source: &str
         // Example: /Users/user/SpacetimeDB/modules/quickstart-chat/src/lib.rs
         let full_path = repo_root.join(&file_path);
         if full_path.exists() && full_path.is_file() {
-            let include_path = if let Some(ref copy_dir) = local_copy_dir {
-                // Outside crate: copy to .templates
-                // Example dest_file: /Users/user/SpacetimeDB/crates/cli/.templates/parent_parent_modules_chat-console-rs/src/lib.rs
-                let dest_file = copy_dir.join(relative_path);
-                fs::create_dir_all(dest_file.parent().unwrap()).expect("Failed to create parent directory");
-                copy_if_changed(&full_path, &dest_file)
-                    .unwrap_or_else(|_| panic!("Failed to copy file {:?} to {:?}", full_path, dest_file));
-
-                // Example relative_to_manifest: .templates/parent_parent_modules_chat-console-rs/src/lib.rs
-                let relative_to_manifest = dest_file.strip_prefix(manifest_dir).unwrap();
-                let path_str = relative_to_manifest.to_str().unwrap().replace("\\", "/");
-                // Watch the original file for changes
-                // Example: modules/chat-console-rs/src/lib.rs
-                println!("cargo:rerun-if-changed={}", full_path.display());
-                path_str
-            } else {
-                // Inside crate: use path relative to CARGO_MANIFEST_DIR
-                // Example file_path: crates/cli/templates/basic-rs/server/src/lib.rs
-                // Example manifest_rel: crates/cli
-                // Result: templates/basic-rs/server/src/lib.rs
-                let relative_to_manifest = file_path.strip_prefix(manifest_rel).unwrap();
-                let path_str = relative_to_manifest.to_str().unwrap().replace("\\", "/");
-                // Example: crates/cli/templates/basic-rs/server/src/lib.rs
-                println!("cargo:rerun-if-changed={}", full_path.display());
-                path_str
-            };
+            let include_path = file_path.to_str().unwrap().replace("\\", "/");
+            println!("cargo:rerun-if-changed={}", full_path.display());
 
-            // Example include_path (inside crate): "templates/basic-rs/server/src/lib.rs"
-            // Example include_path (outside crate): ".templates/parent_parent_modules_chat-console-rs/src/lib.rs"
+            // Example include_path: "templates/basic-rs/src/main.rs"
             // Example relative_str: "src/lib.rs"
             code.push_str(&format!(
-                "        files.insert(\"{}\", include_str!(concat!(env!(\"CARGO_MANIFEST_DIR\"), \"/{}\")));\n",
+                "        files.insert(\"{}\", include_str!(concat!(env!(\"CARGO_MANIFEST_DIR\"), \"/../../{}\")));\n",
                 relative_str, include_path
             ));
         }
@@ -561,22 +512,6 @@ fn write_if_changed(path: &Path, contents: &[u8]) -> io::Result<()> {
     }
 }
 
-fn copy_if_changed(src: &Path, dst: &Path) -> io::Result<()> {
-    let src_bytes = fs::read(src)?;
-    if let Ok(existing) = fs::read(dst)
-        && existing == src_bytes
-    {
-        return Ok(());
-    }
-
-    if let Some(parent) = dst.parent() {
-        fs::create_dir_all(parent)?;
-    }
-
-    let mut file = fs::File::create(dst)?;
-    file.write_all(&src_bytes)
-}
-
 /// Discover skill directories under skills/. Each directory containing a SKILL.md
 /// file is considered a skill. Returns sorted skill names.
 fn discover_skill_names(skills_dir: &Path) -> Vec<String> {

crates/cli/build.rs

@@ -100,14 +100,14 @@ pub struct ModuleHostWithBootstrap {
 /// The handle owns any wait state needed to prove that the database has a
 /// durable `st_module` row.
 pub struct BootstrapCompletion {
-    program_hash: Hash,
+    bootstrap_generation: u64,
     status: ProgramBootstrap,
 }
 
 /// Has the module been bootstrapped from the controldb?
 ///
 /// Once we have inserted into `st_module`, bootstrapping is no longer necessary,
-/// and the initial program bytes can be dropped fromt the controldb.
+/// and the initial program bytes can be dropped from the controldb.
 enum ProgramBootstrap {
     /// The module's program bytes have already been written to `st_module`
     Durable,
@@ -119,32 +119,32 @@ enum ProgramBootstrap {
 }
 
 impl BootstrapCompletion {
-    fn durable(program_hash: Hash) -> Self {
+    fn durable(bootstrap_generation: u64) -> Self {
         Self {
-            program_hash,
+            bootstrap_generation,
             status: ProgramBootstrap::Durable,
         }
     }
 
-    fn pending(program_hash: Hash, tx_offset: TransactionOffset, durable_offset: Option<DurableOffset>) -> Self {
+    fn pending(bootstrap_generation: u64, tx_offset: TransactionOffset, durable_offset: Option<DurableOffset>) -> Self {
         Self {
-            program_hash,
+            bootstrap_generation,
             status: ProgramBootstrap::Pending {
                 tx_offset,
                 durable_offset,
             },
         }
     }
 
-    pub fn program_hash(&self) -> Hash {
-        self.program_hash
+    pub fn bootstrap_generation(&self) -> u64 {
+        self.bootstrap_generation
     }
 
     /// Wait until it is safe to complete program bootstrap in controldb.
     /// That is, wait until the initial `st_module` insert becomes durable.
-    pub async fn wait(self) -> anyhow::Result<Hash> {
+    pub async fn wait(self) -> anyhow::Result<()> {
         match self.status {
-            ProgramBootstrap::Durable => Ok(self.program_hash),
+            ProgramBootstrap::Durable => Ok(()),
             ProgramBootstrap::Pending {
                 tx_offset,
                 durable_offset,
@@ -160,7 +160,7 @@ impl BootstrapCompletion {
                         .context("failed waiting for initialized program to become durable")?;
                 }
 
-                Ok(self.program_hash)
+                Ok(())
             }
         }
     }
@@ -1132,7 +1132,8 @@ impl Host {
                 (program, true)
             }
         };
-        let mut bootstrap_completion = Some(BootstrapCompletion::durable(program.hash));
+        let bootstrap_generation = database.bootstrap_generation;
+        let mut bootstrap_completion = Some(BootstrapCompletion::durable(bootstrap_generation));
 
         let relational_db = Arc::new(db);
         let (program, launched) = match HostType::from(program.kind) {
@@ -1222,13 +1223,12 @@ impl Host {
         };
 
         if program_needs_init {
-            let program_hash = program.hash;
             let InitDatabaseResult { reducer, tx_offset } = launched.module_host.init_database(program).await?;
             if let Some(call_result) = reducer {
                 Result::from(call_result)?;
             }
             bootstrap_completion = Some(BootstrapCompletion::pending(
-                program_hash,
+                bootstrap_generation,
                 tx_offset,
                 launched.module_host.durable_tx_offset(),
             ));
@@ -1540,6 +1540,7 @@ pub(crate) async fn extract_schema_with_pools(
         owner_identity,
         host_type,
         initial_program: program.hash,
+        bootstrap_generation: 0,
     };
 
     let core = AllocatedJobCore::default();

crates/core/src/host/host_controller.rs

@@ -1377,6 +1377,7 @@ mod test {
                     owner_identity: Identity::ZERO,
                     host_type: HostType::Wasm,
                     initial_program: Hash::ZERO,
+                    bootstrap_generation: 0,
                 },
                 replica_id: 0,
                 logger,