Merge branch 'main' into feat/proximity-forwarding-v2

Author: sanity

.githooks/README.md

@@ -0,0 +1,72 @@
+# Git Hooks
+
+This directory contains git hooks that enforce code quality and commit message standards.
+
+## Installation
+
+To install these hooks, run from the repository root:
+
+```bash
+# Install commit-msg hook
+cp .githooks/commit-msg .git/hooks/
+chmod +x .git/hooks/commit-msg
+
+# Or configure git to use this hooks directory
+git config core.hooksPath .githooks
+```
+
+## Available Hooks
+
+### commit-msg
+
+Validates that commit messages follow [Conventional Commits](https://www.conventionalcommits.org/) format.
+
+**Required format:**
+```
+type(scope): description
+
+[optional body]
+
+[optional footer(s)]
+```
+
+**Allowed types:**
+- `feat`: New feature
+- `fix`: Bug fix
+- `docs`: Documentation changes
+- `style`: Code style changes (formatting, etc.)
+- `refactor`: Code refactoring
+- `perf`: Performance improvements
+- `test`: Adding or modifying tests
+- `build`: Build system or dependency changes
+- `ci`: CI/CD changes
+
+**Examples:**
+```bash
+fix: resolve WebSocket connection timeout
+feat(network): add peer reputation scoring
+build(deps): bump tokio from 1.0 to 1.1
+fix!: breaking change to API
+```
+
+**Important:**
+- Type must be **lowercase** (e.g., `fix:` not `Fix:`)
+- This matches the CI check on GitHub PRs
+- Breaking changes can be indicated with `!` after the type
+
+### pre-commit
+
+The pre-commit hook (already installed in `.git/hooks/pre-commit`) checks:
+- Code formatting with `cargo fmt`
+- Clippy lints
+- Special TODO comments that block commits
+- Disabled tests using Claude
+
+**Note:** The pre-commit hook is specific to your local setup and is already installed by git hooks installation scripts. It's not included in this directory as it's environment-specific.
+
+## Why This Matters
+
+- **CI Compatibility**: Our GitHub Actions CI checks PR titles for Conventional Commits format
+- **Consistency**: Everyone uses the same commit message style
+- **Automation**: Makes it easier to generate changelogs and release notes
+- **Early Feedback**: Catch issues locally before pushing to GitHub

.githooks/commit-msg

@@ -0,0 +1,41 @@
+#!/bin/bash
+# Commit message hook that validates Conventional Commits format
+
+# Colors for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
+
+# Get the commit message file path (passed as first argument)
+COMMIT_MSG_FILE=$1
+
+if [ ! -f "$COMMIT_MSG_FILE" ]; then
+    echo -e "${RED}Error: Commit message file not found${NC}"
+    exit 1
+fi
+
+# Get the first line of the commit message
+FIRST_LINE=$(head -n1 "$COMMIT_MSG_FILE")
+
+# Conventional Commits pattern: type(scope): description OR type: description
+# type must be lowercase and from allowed list
+# type can optionally be followed by ! for breaking changes
+CONVENTIONAL_PATTERN="^(feat|fix|docs|style|refactor|perf|test|build|ci)(\([a-z0-9_-]+\))?!?: .+"
+
+if echo "$FIRST_LINE" | grep -qE "$CONVENTIONAL_PATTERN"; then
+    exit 0
+else
+    echo -e "${RED}✗ Commit message doesn't follow Conventional Commits format${NC}"
+    echo -e "${YELLOW}First line must match pattern: type(scope): description${NC}"
+    echo -e "${YELLOW}Allowed types: feat, fix, docs, style, refactor, perf, test, build, ci${NC}"
+    echo -e "${YELLOW}Type must be lowercase. Examples:${NC}"
+    echo -e "  ${GREEN}fix: resolve WebSocket connection timeout${NC}"
+    echo -e "  ${GREEN}feat(network): add peer reputation scoring${NC}"
+    echo -e "  ${GREEN}build(deps): bump tokio from 1.0 to 1.1${NC}"
+    echo -e "  ${GREEN}fix!: breaking change to API${NC}"
+    echo ""
+    echo -e "${RED}Your commit message:${NC}"
+    echo -e "${YELLOW}$FIRST_LINE${NC}"
+    exit 1
+fi

.github/workflows/auto-label-issues.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Check user account age to prevent spam
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             // Anti-spam: Only process issues from users with accounts older than 7 days
@@ -51,7 +51,7 @@ jobs:
       - name: Analyze issue and suggest labels
         if: steps.spam_check.outputs.skip != 'true'
         id: analyze
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
         with:

crates/core/src/operations/subscribe.rs

@@ -84,10 +84,22 @@ pub(crate) async fn request_subscribe(
                 tracing::debug!(%key, "No remote peers available for subscription, checking locally");
 
                 if super::has_contract(op_manager, *key).await? {
-                    // We have the contract locally - complete operation immediately
-                    // Following Nacho's suggestion: use notify_node_event to tap into
-                    // result router directly without state transitions
-                    tracing::info!(%key, tx = %id, "Contract available locally, completing subscription via result router");
+                    // We have the contract locally - register subscription and complete immediately
+                    tracing::info!(%key, tx = %id, "Contract available locally, registering local subscription");
+
+                    // CRITICAL FIX for issue #2001: Register subscriber in DashMap before completing
+                    // Without this, UPDATE operations won't find subscribers for locally-cached contracts
+                    let subscriber = op_manager.ring.connection_manager.own_location();
+                    if op_manager
+                        .ring
+                        .add_subscriber(key, subscriber.clone())
+                        .is_err()
+                    {
+                        tracing::error!(%key, tx = %id, "Failed to add local subscriber - max subscribers reached");
+                        // Continue anyway - client requested subscription and contract is local
+                    } else {
+                        tracing::debug!(%key, tx = %id, subscriber = %subscriber.peer, "Successfully registered local subscriber");
+                    }
 
                     // Use notify_node_event to deliver SubscribeResponse directly to client
                     // This avoids the problem with notify_op_change overwriting the operation

crates/core/tests/operations.rs

@@ -1148,6 +1148,8 @@ async fn test_multiple_clients_subscription() -> TestResult {
             }
         }
 
+        tracing::info!("All clients subscribed, proceeding with UPDATE operation");
+
         // Create a new to-do list by deserializing the current state, adding a task, and serializing it back
         let mut todo_list: test_utils::TodoList = serde_json::from_slice(wrapped_state.as_ref())
             .unwrap_or_else(|_| test_utils::TodoList {