@mhalder/qdrant-mcp-server 3.1.2 → 3.2.1

package/.dagger/.gitattributes

@@ -0,0 +1 @@
+/sdk/** linguist-generated

package/.dagger/package.json

@@ -0,0 +1,6 @@
+{
+  "type": "module",
+  "dependencies": {
+    "typescript": "5.9.3"
+  }
+}

package/.dagger/src/index.ts

@@ -0,0 +1,83 @@
+import {
+  dag,
+  Container,
+  Directory,
+  object,
+  func,
+  argument,
+} from "@dagger.io/dagger"
+
+const SUPPORTED_NODE_VERSIONS = ["22", "24"]
+
+@object()
+export class Ci {
+  private base(source: Directory, nodeVersion: string): Container {
+    if (!SUPPORTED_NODE_VERSIONS.includes(nodeVersion)) {
+      throw new Error(
+        `Unsupported Node version "${nodeVersion}". Must be one of: ${SUPPORTED_NODE_VERSIONS.join(", ")}`,
+      )
+    }
+
+    let ctr = dag
+      .container()
+      .from(`node:${nodeVersion}-slim`)
+      .withExec(["apt-get", "update"])
+      .withExec([
+        "apt-get",
+        "install",
+        "-y",
+        "--no-install-recommends",
+        "python3",
+        "make",
+        "g++",
+        "git",
+      ])
+      .withMountedDirectory("/app", source)
+      .withWorkdir("/app")
+      // Dagger context directories exclude .git dirs but may include
+      // a .git worktree file pointing to a host path. Remove it and
+      // init a fresh repo so integration tests pass.
+      .withExec(["rm", "-rf", ".git"])
+      .withExec(["git", "init"])
+      .withExec(["git", "config", "user.email", "ci@dagger"])
+      .withExec(["git", "config", "user.name", "CI"])
+      .withExec(["git", "add", "."])
+      .withExec(["git", "commit", "-m", "init", "--allow-empty"])
+
+    if (nodeVersion.startsWith("24")) {
+      ctr = ctr.withEnvVariable("CXXFLAGS", "-std=c++20")
+    }
+
+    return ctr.withExec(["npm", "ci"])
+  }
+
+  @func()
+  check(
+    @argument({ defaultPath: "/" }) source: Directory,
+    nodeVersion: string = "22",
+  ): Container {
+    return this.base(source, nodeVersion)
+      .withExec(["npm", "run", "type-check"])
+      .withExec(["npm", "run", "build"])
+  }
+
+  @func()
+  async test(
+    @argument({ defaultPath: "/" }) source: Directory,
+    nodeVersion: string = "22",
+  ): Promise<Directory> {
+    return this.check(source, nodeVersion)
+      .withExec(["npm", "run", "test:coverage"])
+      .withExec(["npm", "run", "test:providers"])
+      .directory("/app/coverage")
+  }
+
+  @func()
+  async testAll(
+    @argument({ defaultPath: "/" }) source: Directory,
+  ): Promise<string> {
+    const versions = ["22", "24"]
+    await Promise.all(versions.map((v) => this.test(source, v)))
+    return `All tests passed on Node ${versions.join(", ")}`
+  }
+}

package/.dagger/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "moduleResolution": "Node",
+    "experimentalDecorators": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "paths": {
+      "@dagger.io/dagger": ["./sdk/index.ts"],
+      "@dagger.io/dagger/telemetry": ["./sdk/telemetry.ts"]
+    }
+  }
+}

package/.dagger/yarn.lock

@@ -0,0 +1,8 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+typescript@5.9.3:
+  version "5.9.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f"
+  integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==

package/.github/workflows/ci.yml

@@ -7,43 +7,33 @@ on:
     branches: [main]
 
 jobs:
-  build-and-test:
-    name: Build and Test
+  test:
+    name: Test (Node ${{ matrix.node-version }})
     runs-on: ubuntu-latest
-
     strategy:
       matrix:
-        node-version: [22.x, 24.x]
+        node-version: ["22", "24"]
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
-      - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+      - name: Run tests via Dagger
+        uses: dagger/dagger-for-github@v7
         with:
-          node-version: ${{ matrix.node-version }}
-          cache: "npm"
-
-      - name: Install dependencies
-        run: npm ci
-        env:
-          # Node 24 requires C++20 for native modules
-          CXXFLAGS: ${{ matrix.node-version == '24.x' && '-std=c++20' || '' }}
-
-      - name: Type check
-        run: npm run type-check
+          verb: call
+          args: test --source=. --node-version=${{ matrix.node-version }}
+          version: "0.19.10"
 
-      - name: Build project
-        run: npm run build
-
-      - name: Run tests with coverage
-        run: npm run test:coverage
-
-      - name: Run provider verification tests
-        run: npm run test:providers
+      - name: Export coverage
+        if: matrix.node-version == '22'
+        uses: dagger/dagger-for-github@v7
+        with:
+          verb: call
+          args: test --source=. --node-version=22 export --path=./coverage
+          version: "0.19.10"
 
       - name: Upload coverage to Codecov
+        if: matrix.node-version == '22'
         uses: codecov/codecov-action@v4
         continue-on-error: true
         with:

package/.github/workflows/release.yml

@@ -18,32 +18,29 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           persist-credentials: false
 
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
+      # Dagger gate: type-check + build validation
+      - name: Check via Dagger
+        uses: dagger/dagger-for-github@v7
         with:
-          node-version: '22.x'
-          cache: 'npm'
+          verb: call
+          args: check --source=. --node-version=22
+          version: "0.19.10"
 
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Type check
-        run: npm run type-check
-
-      - name: Build project
-        run: npm run build
-
-      - name: Run tests
-        run: npm test -- --run
+      # Native release (needs OIDC token for npm provenance)
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "22.x"
+          cache: "npm"
 
-      - name: Run provider verification tests
-        run: npm run test:providers
+      - run: npm ci
+      - run: npm run build
+      - run: npm test -- --run
+      - run: npm run test:providers
 
       - name: Release
         env:

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## <small>3.2.1 (2026-01-30)</small>
+
+* Merge pull request #52 from mhalder/feat/dagger ([da115bb](https://github.com/mhalder/qdrant-mcp-server/commit/da115bb)), closes [#52](https://github.com/mhalder/qdrant-mcp-server/issues/52)
+* fix(dagger): validate node version and pin engine version ([61625b9](https://github.com/mhalder/qdrant-mcp-server/commit/61625b9))
+* style(dagger): reformat package.json ([c22ca40](https://github.com/mhalder/qdrant-mcp-server/commit/c22ca40))
+* ci(dagger): replace GHA CI with Dagger TypeScript module ([d79a77e](https://github.com/mhalder/qdrant-mcp-server/commit/d79a77e))
+
+## 3.2.0 (2026-01-24)
+
+* Merge pull request #51 from mhalder/feat/advanced-search ([e99311b](https://github.com/mhalder/qdrant-mcp-server/commit/e99311b)), closes [#51](https://github.com/mhalder/qdrant-mcp-server/issues/51)
+* fix(federated): rank within repo+type groups for fair RRF interleaving ([958411a](https://github.com/mhalder/qdrant-mcp-server/commit/958411a))
+* fix(federated): use segment comparison for path matching ([9de2b85](https://github.com/mhalder/qdrant-mcp-server/commit/9de2b85))
+* docs(contributing): simplify and remove redundancy ([393a918](https://github.com/mhalder/qdrant-mcp-server/commit/393a918))
+* docs(readme): fix Claude Code MCP config path and format ([4c338f0](https://github.com/mhalder/qdrant-mcp-server/commit/4c338f0))
+* docs(readme): simplify quick start config and add usage examples ([e3a8978](https://github.com/mhalder/qdrant-mcp-server/commit/e3a8978))
+* feat(tools): add contextual and federated search tools ([48d880e](https://github.com/mhalder/qdrant-mcp-server/commit/48d880e))
+* chore(prompts): add git indexing prompt templates ([38607a8](https://github.com/mhalder/qdrant-mcp-server/commit/38607a8))
+
 ## <small>3.1.2 (2026-01-23)</small>
 
 * Merge pull request #50 from mhalder/fix/pathpattern-filter ([b12517f](https://github.com/mhalder/qdrant-mcp-server/commit/b12517f)), closes [#50](https://github.com/mhalder/qdrant-mcp-server/issues/50)

package/CONTRIBUTING.md

@@ -2,171 +2,69 @@
 
 Thank you for your interest in contributing!
 
-## Getting Started
+## Quick Start
 
 ```bash
-# 1. Fork and clone
+# Fork and clone
 git clone https://github.com/YOUR_USERNAME/qdrant-mcp-server.git
 cd qdrant-mcp-server
 npm install
 
-# 2. Create feature branch
+# Create feature branch
 git checkout -b feat/your-feature-name
 
-# 3. Make changes, add tests
-
-# 4. Verify
+# Make changes, then verify
 npm test -- --run
 npm run type-check
 npm run build
 
-# 5. Commit with conventional format
+# Commit with conventional format
 git commit -m "feat: add new feature"
 ```
 
 ## Development Commands
 
-| Command                  | Purpose                      |
-| ------------------------ | ---------------------------- |
-| `npm run build`          | Build for production         |
-| `npm run dev`            | Development with auto-reload |
-| `npm test`               | Run test suite               |
-| `npm run test:ui`        | Tests with UI                |
-| `npm run test:coverage`  | Coverage report              |
-| `npm run test:providers` | Provider verification        |
-| `npm run type-check`     | TypeScript validation        |
+| Command                 | Purpose              |
+| ----------------------- | -------------------- |
+| `npm run build`         | Build for production |
+| `npm run dev`           | Dev with auto-reload |
+| `npm test`              | Run test suite       |
+| `npm run test:coverage` | Coverage report      |
+| `npm run type-check`    | TypeScript check     |
 
 ## Commit Convention
 
-This project uses [Conventional Commits](https://www.conventionalcommits.org/) for automated versioning and releases.
-
-### Format
+Use [Conventional Commits](https://www.conventionalcommits.org/):
 
 ```
 <type>(<scope>): <subject>
-
-<body>
-
-<footer>
-```
-
-### Types
-
-| Type       | Description             | Version Bump  |
-| ---------- | ----------------------- | ------------- |
-| `feat`     | New feature             | Minor (1.x.0) |
-| `fix`      | Bug fix                 | Patch (1.0.x) |
-| `docs`     | Documentation           | Patch         |
-| `refactor` | Code refactoring        | Patch         |
-| `perf`     | Performance improvement | Patch         |
-| `test`     | Adding/updating tests   | None          |
-| `chore`    | Build/dependencies      | None          |
-| `ci`       | CI/CD changes           | None          |
-| `style`    | Code style/formatting   | None          |
-
-### Breaking Changes
-
-Add `BREAKING CHANGE:` in body/footer or append `!` after type:
-
-```bash
-feat!: remove Node 16 support
-
-BREAKING CHANGE: Node 16 is no longer supported
 ```
 
-This triggers a major version bump (x.0.0).
+**Types:** `feat`, `fix`, `docs`, `refactor`, `perf`, `test`, `chore`, `ci`
 
-### Examples
+**Examples:**
 
 ```bash
-# Feature
-feat(embeddings): add support for new provider
-
-# Bug fix
-fix(search): correct similarity score calculation
-
-# Documentation
-docs: update installation instructions
-
-# Breaking change
-feat!: change collection schema format
+feat(embeddings): add new provider
+fix(search): correct score calculation
+docs: update installation guide
+feat!: breaking change (major version bump)
 ```
 
-### Validation
-
-Commitlint enforces:
+## Pull Requests
 
-- Conventional commits format required
-- Valid type required
-- Subject must not be empty or end with period
-- Header max 100 characters
-- Subject must not start with uppercase
+1. Add tests for changes
+2. Update docs if needed
+3. Pass CI checks (build, type-check, tests)
+4. Use conventional commit format for PR title
 
-## Pull Request Process
+## Releases
 
-1. **Update docs** if needed
-2. **Add tests** for changes
-3. **Pass CI checks** (build, type-check, tests)
-4. **Request review**
-5. **Merge** after approval
-
-### PR Title
-
-Use conventional commit format:
-
-```
-feat: add new search feature
-fix: resolve connection timeout
-docs: improve setup documentation
-```
-
-## Release Process
-
-Automated via [semantic-release](https://semantic-release.gitbook.io/):
-
-- Releases on merge to `main`
-- Version follows [Semantic Versioning](https://semver.org/)
-- Changelog auto-generated from commits
-- Packages published to npm
-
-### Version Bumps
+Automated via [semantic-release](https://semantic-release.gitbook.io/) on merge to `main`:
 
 - `feat` → minor (1.x.0)
-- `fix`, `perf`, `docs`, `refactor` → patch (1.0.x)
-- `BREAKING CHANGE` → major (x.0.0)
-
-## Testing
-
-- Write tests for all new features and bug fixes
-- Maintain or improve code coverage
-- Run full test suite before submitting PRs
-- Include both unit and integration tests
-
-## Project Structure
-
-```
-qdrant-mcp-server/
-├── src/              # Source code
-│   ├── code/         # Code indexing and vectorization
-│   │   ├── chunker/  # AST-aware code chunking
-│   │   └── sync/     # File synchronization with Merkle trees
-│   ├── embeddings/   # Embedding providers (Ollama, OpenAI, Cohere, Voyage)
-│   ├── prompts/      # MCP prompt templates and registration
-│   ├── qdrant/       # Qdrant vector database client
-│   ├── resources/    # MCP resource definitions
-│   └── tools/        # MCP tool implementations
-│       ├── code.ts       # Code indexing tools
-│       ├── collection.ts # Collection management
-│       ├── document.ts   # Document operations
-│       ├── search.ts     # Search tools (semantic + hybrid)
-│       ├── schemas.ts    # Zod validation schemas
-│       └── index.ts      # Tool registration orchestrator
-├── build/            # Compiled output
-├── examples/         # Usage examples
-├── scripts/          # Utility scripts
-├── .github/          # GitHub Actions workflows
-└── .husky/           # Git hooks
-```
+- `fix`, `docs`, `refactor`, `perf` → patch (1.0.x)
+- `BREAKING CHANGE` or `!` → major (x.0.0)
 
 ## Questions?
 

package/README.md

@@ -11,6 +11,7 @@ A Model Context Protocol (MCP) server providing semantic search capabilities usi
 - **Privacy-First**: Local embeddings and vector storage - data never leaves your machine
 - **Code Vectorization**: Intelligent codebase indexing with AST-aware chunking and semantic code search
 - **Git History Search**: Index commit history for semantic search over past changes, fixes, and patterns
+- **Advanced Search**: Contextual search (code + git with correlations) and federated search across multiple repositories
 - **Multiple Providers**: Ollama (default), OpenAI, Cohere, and Voyage AI
 - **Hybrid Search**: Combine semantic and keyword search for better results
 - **Semantic Search**: Natural language search with metadata filtering
@@ -57,42 +58,33 @@ npm run build
 
 #### Local Setup (stdio transport)
 
-Add to `~/.claude/claude_code_config.json`:
+```bash
+claude mcp add --transport stdio qdrant -- node /path/to/qdrant-mcp-server/build/index.js
+```
+
+Or add to `~/.claude.json`:
 
 ```json
 {
   "mcpServers": {
     "qdrant": {
+      "type": "stdio",
       "command": "node",
-      "args": ["/path/to/qdrant-mcp-server/build/index.js"],
-      "env": {
-        "QDRANT_URL": "http://localhost:6333",
-        "EMBEDDING_BASE_URL": "http://localhost:11434"
-      }
+      "args": ["/path/to/qdrant-mcp-server/build/index.js"]
     }
   }
 }
 ```
 
-#### Connecting to Secured Qdrant Instances
+For Qdrant Cloud or secured instances, add `--env QDRANT_API_KEY=your-key` or set in env config.
 
-For Qdrant Cloud or self-hosted instances with API key authentication:
+**Try it:**
 
-```json
-{
-  "mcpServers": {
-    "qdrant": {
-      "command": "node",
-      "args": ["/path/to/qdrant-mcp-server/build/index.js"],
-      "env": {
-        "QDRANT_URL": "https://your-cluster.qdrant.io:6333",
-        "QDRANT_API_KEY": "your-api-key-here",
-        "EMBEDDING_BASE_URL": "http://localhost:11434"
-      }
-    }
-  }
-}
 ```
+Create a collection called "notes" and add a document about machine learning
+```
+
+**Enable example prompts:** Copy `prompts.example.json` to `prompts.json` and restart. Use `/prompt` to list available prompts.
 
 #### Remote Setup (HTTP transport)
 
@@ -111,12 +103,19 @@ For Qdrant Cloud or self-hosted instances with API key authentication:
 TRANSPORT_MODE=http HTTP_PORT=3000 node build/index.js
 ```
 
-**Configure client:**
+**Option 1: Using `claude mcp add`**
+
+```bash
+claude mcp add --transport http qdrant http://your-server:3000/mcp
+```
+
+**Option 2: Add to `~/.claude.json`**
 
 ```json
 {
   "mcpServers": {
     "qdrant": {
+      "type": "http",
       "url": "http://your-server:3000/mcp"
     }
   }
@@ -177,6 +176,13 @@ See [Advanced Configuration](#advanced-configuration) section below for all opti
 | `get_git_index_status` | Get indexing status and statistics for a repository's git history        |
 | `clear_git_index`      | Delete all indexed git history data for a repository                     |
 
+### Advanced Search
+
+| Tool                | Description                                                                   |
+| ------------------- | ----------------------------------------------------------------------------- |
+| `contextual_search` | Combined code + git history search with file-commit correlations              |
+| `federated_search`  | Search across multiple repositories with Reciprocal Rank Fusion (RRF) ranking |
+
 ### Resources
 
 - `qdrant://collections` - List all collections
@@ -231,14 +237,18 @@ If you place `prompts.json` in the project root, no additional configuration is
 
 See [`prompts.example.json`](prompts.example.json) for ready-to-use prompts including:
 
-- `find_similar_docs` - Semantic search with result explanation
 - `setup_rag_collection` - Create RAG-optimized collections
-- `analyze_collection` - Collection insights and recommendations
-- `bulk_add_documents` - Guided bulk document insertion
-- `search_with_filter` - Metadata filtering assistance
-- `compare_search_methods` - Semantic vs hybrid search comparison
-- `collection_maintenance` - Maintenance and cleanup workflows
+- `analyze_and_optimize` - Collection insights and recommendations
+- `compare_search_strategies` - Semantic vs hybrid search comparison
 - `migrate_to_hybrid` - Collection migration guide
+- `debug_search_quality` - Troubleshoot poor search results
+- `build_knowledge_base` - Structured documentation with metadata
+- `index_git_history` - Index repository commit history for semantic search
+- `search_project_history` - Search git history to understand feature implementations
+- `investigate_code_with_history` - Deep dive into code with contextual search
+- `cross_repo_search` - Search patterns across multiple repositories
+- `trace_feature_evolution` - Track how features evolved over time
+- `security_audit_search` - Find security-related code and fixes
 
 ### Template Syntax
 
@@ -484,6 +494,15 @@ Index and search your repository's git commit history using natural language. Pe
 - **Learning from History**: "Show me examples of API endpoint implementations"
 - **Code Archaeology**: "What changes were made to the payment system last year?"
 
+## Advanced Search
+
+Combine code and git history search for deeper codebase understanding. Requires repositories to be indexed with both `index_codebase` and `index_git_history` first.
+
+- **Contextual Search**: Query code + git history together with automatic file-commit correlations
+- **Federated Search**: Search across multiple repositories with RRF ranking
+
+See **[Advanced Search Examples](examples/advanced-search/)** for detailed usage, workflows, and scenarios.
+
 ## Examples
 
 See [examples/](examples/) directory for detailed guides:
@@ -494,6 +513,7 @@ See [examples/](examples/) directory for detailed guides:
 - **[Advanced Filtering](examples/filters/)** - Complex boolean filters
 - **[Rate Limiting](examples/rate-limiting/)** - Batch processing with cloud providers
 - **[Code Search](examples/code-search/)** - Index codebases and semantic code search
+- **[Advanced Search](examples/advanced-search/)** - Contextual and federated search across repositories
 
 ## Advanced Configuration
 
@@ -594,15 +614,27 @@ npm test             # Run test suite
 npm run test:coverage # Coverage report
 ```
 
+### Dagger (Portable CI)
+
+The CI pipeline is implemented as a [Dagger](https://dagger.io/) TypeScript module, making it runnable locally or in any CI system:
+
+```bash
+dagger call check --source=.                    # Type-check + build (Node 22)
+dagger call check --source=. --node-version=24  # Type-check + build (Node 24)
+dagger call test --source=.                     # Full test suite + coverage
+dagger call test-all --source=.                 # Test on Node 22 + 24 in parallel
+```
+
 ### Testing
 
-**718 tests** across 26 test files with **97%+ coverage**:
+**748 tests** across 27 test files with **97%+ coverage**:
 
 - **Unit Tests**: QdrantManager (56), Ollama (41), OpenAI (25), Cohere (29), Voyage (31), Factory (43), Prompts (50), Transport (15), MCP Server (19)
 - **Integration Tests**: Code indexer (56), scanner (15), chunker (24), synchronizer (42), snapshot (26), merkle tree (28)
 - **Git History Tests**: Git extractor (28), extractor integration (11), chunker (30), indexer (42), synchronizer (18)
+- **Advanced Search Tests**: Federated tools (30) - normalizeScores, calculateRRFScore, buildCorrelations, contextual_search, federated_search
 
-**CI/CD**: GitHub Actions runs build, type-check, and tests on Node.js 22.x and 24.x for every push/PR.
+**CI/CD**: [Dagger](https://dagger.io/) module runs build, type-check, and tests on Node.js 22 and 24. GitHub Actions invokes Dagger for CI and uses native `semantic-release` for publishing.
 
 ## Contributing