@jussmor/commit-memory-mcp 0.4.1 → 0.4.2

package/README.md

@@ -108,7 +108,8 @@ build_context_pack({
 ```
 
 Use this before invoking a coding subagent to keep prompts small and focused.
-If no rows are found in strict scope, the server now falls back automatically to broader scope levels.
+The pack is assembled main-first: promoted facts on `main` are treated as baseline truth, then branch/feature facts are added as in-flight overlay.
+If no rows are found in strict scope, the server falls back automatically to broader scope levels.
 
 Important: if you provide `domain`/`feature`/`branch` tags in `build_context_pack`, use the same tags during `sync_pr_context` for best precision.
 

package/dist/db/client.js

@@ -372,6 +372,7 @@ export function promoteContextFacts(db, options) {
 }
 export function buildContextPack(db, options) {
     const taskType = options.taskType ?? "general";
+    const GLOBAL_BRANCH = "main";
     function runQuery(params) {
         const clauses = [];
         const values = [taskType];
@@ -383,7 +384,11 @@ export function buildContextPack(db, options) {
             clauses.push("scope_feature = ?");
             values.push(options.feature);
         }
-        if (params.includeBranch && options.branch) {
+        if (params.forcedBranch) {
+            clauses.push("scope_branch = ?");
+            values.push(params.forcedBranch);
+        }
+        else if (params.includeBranch && options.branch) {
             clauses.push("scope_branch = ?");
             values.push(options.branch);
         }
@@ -444,27 +449,61 @@ export function buildContextPack(db, options) {
             updatedAt: String(row.updated_at ?? ""),
         }));
     }
-    const strictRows = runQuery({
+    const seenIds = new Set();
+    const pack = [];
+    const addRows = (rows) => {
+        for (const row of rows) {
+            if (pack.length >= options.limit) {
+                return;
+            }
+            if (seenIds.has(row.id)) {
+                continue;
+            }
+            seenIds.add(row.id);
+            pack.push(row);
+        }
+    };
+    // 1) Main branch domain context is the durable source-of-truth baseline.
+    if (pack.length < options.limit) {
+        addRows(runQuery({
+            includeDomain: true,
+            includeFeature: false,
+            includeBranch: false,
+            forcedBranch: GLOBAL_BRANCH,
+        }));
+    }
+    // 2) Main branch global context fills any remaining baseline slots.
+    if (pack.length < options.limit) {
+        addRows(runQuery({
+            includeDomain: false,
+            includeFeature: false,
+            includeBranch: false,
+            forcedBranch: GLOBAL_BRANCH,
+        }));
+    }
+    // 3) Branch-local feature context overlays main for active, in-flight work.
+    addRows(runQuery({
         includeDomain: true,
         includeFeature: true,
         includeBranch: true,
-    });
-    if (strictRows.length > 0) {
-        return strictRows;
+    }));
+    // 4) Domain-wide branch context provides additional short-lived signal.
+    if (pack.length < options.limit) {
+        addRows(runQuery({
+            includeDomain: true,
+            includeFeature: false,
+            includeBranch: false,
+        }));
     }
-    const broadRows = runQuery({
-        includeDomain: true,
-        includeFeature: false,
-        includeBranch: false,
-    });
-    if (broadRows.length > 0) {
-        return broadRows;
+    // 5) Final safety net from all promoted context.
+    if (pack.length < options.limit) {
+        addRows(runQuery({
+            includeDomain: false,
+            includeFeature: false,
+            includeBranch: false,
+        }));
     }
-    return runQuery({
-        includeDomain: false,
-        includeFeature: false,
-        includeBranch: false,
-    });
+    return pack;
 }
 export function archiveFeatureContext(db, options) {
     const now = new Date().toISOString();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jussmor/commit-memory-mcp",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "mcpName": "io.github.jussmor/commit-memory",
   "description": "Commit-aware RAG with sqlite-vec and MCP tools for local agent workflows",
   "license": "MIT",