@danielmarbach/mnemonic-mcp 0.5.1 → 0.6.0

package/CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to `mnemonic` will be documented in this file.
 
 The format is loosely based on Keep a Changelog and uses semver-style version headings.
 
+## [0.6.0] - 2026-03-13
+
+### Added
+
+- Protected-branch policy support for automatic `remember` project-vault commits. `ProjectMemoryPolicy` now supports `protectedBranchBehavior` (`ask` | `block` | `allow`) and `protectedBranchPatterns` (glob-like patterns). Built-in patterns are `main`, `master`, and `release*`.
+- `remember` now accepts `allowProtectedBranch` as a one-time override when a protected-branch policy would otherwise ask or block.
+
+### Changed
+
+- `set_project_memory_policy` and `get_project_memory_policy` now manage and display protected-branch settings in addition to write-scope and consolidation defaults.
+- `remember` now checks the current local git branch before automatic project-vault commits (scope omitted) and follows protected-branch policy with actionable guidance.
+
 ## [0.5.1] - 2026-03-12
 
 ### Fixed

package/README.md

@@ -208,6 +208,7 @@ User-tunable fields:
 | `mutationPushMode` | `"main-only"` | When to auto-push after a write: `"all"`, `"main-only"`, or `"none"` |
 
 `projectMemoryPolicies` and `projectIdentityOverrides` are written automatically by `set_project_memory_policy` and `set_project_identity` — no need to edit them by hand.
+Project memory policies can include protected-branch settings (`protectedBranchBehavior`, `protectedBranchPatterns`) used by `remember` when writing to project vaults.
 
 Example — raise concurrency on a fast machine and disable auto-push everywhere:
 
@@ -255,7 +256,14 @@ Two vault types store notes:
 - `cwd` + `scope: "global"` → main vault, with project association in frontmatter
 - no `cwd` → main vault as a plain global memory
 
-Use `set_project_memory_policy` to save a per-project default. Supported values: `project`, `global`, `ask`. When policy is `ask`, `remember` returns a clear choice instead of guessing.
+Use `set_project_memory_policy` to save per-project defaults:
+
+- write scope (`project`, `global`, `ask`)
+- consolidation mode (`supersedes`, `delete`)
+- protected-branch behavior for project-vault writes (`ask`, `block`, `allow`)
+- protected-branch patterns (glob strings; defaults are `main`, `master`, `release*`)
+
+When write scope policy is `ask`, `remember` returns a clear storage choice instead of guessing. When protected-branch behavior is `ask`, `remember` returns a one-time override option plus instructions to persist `block`/`allow`.
 
 ### Project identity
 
@@ -370,7 +378,7 @@ Imported notes are written to the main vault with `lifecycle: permanent` and `sc
 | `forget`                    | Delete note + embedding, git commit + push, cleanup relationships        |
 | `get`                       | Fetch one or more notes by exact id                                      |
 | `get_project_identity`      | Show effective project identity and remote override                      |
-| `get_project_memory_policy` | Show saved default write scope                                           |
+| `get_project_memory_policy` | Show saved write scope, consolidation mode, and protected-branch settings |
 | `list`                      | List notes filtered by scope/tags/storage                                |
 | `list_migrations`           | List available migrations and pending count                              |
 | `memory_graph`              | Show compact adjacency list of relationships                             |
@@ -381,7 +389,7 @@ Imported notes are written to the main vault with `lifecycle: permanent` and `sc
 | `remember`                  | Write note + embedding; `cwd` sets context, `scope` picks storage, `lifecycle` picks temporary vs permanent |
 | `relate`                    | Create typed relationship between notes (bidirectional)                  |
 | `set_project_identity`      | Save which git remote defines project identity                           |
-| `set_project_memory_policy` | Save default write scope for project (`project`, `global`, `ask`)       |
+| `set_project_memory_policy` | Save project policy defaults (scope, consolidation mode, protected-branch behavior/patterns) |
 | `sync`                      | Git sync when remote exists plus embedding backfill always; `force=true` rebuilds all embeddings |
 | `unrelate`                  | Remove relationship between notes                                        |
 | `update`                    | Update note content/title/tags/lifecycle, re-embeds always               |

package/build/config.d.ts

@@ -1,4 +1,4 @@
-import type { ProjectMemoryPolicy } from "./project-memory-policy.js";
+import { type ProjectMemoryPolicy } from "./project-memory-policy.js";
 import type { ProjectIdentityOverride } from "./project.js";
 export type MutationPushMode = "all" | "main-only" | "none";
 export interface MnemonicConfig {

package/build/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAE5D,MAAM,MAAM,gBAAgB,GAAG,KAAK,GAAG,WAAW,GAAG,MAAM,CAAC;AAE5D,MAAM,WAAW,cAAc;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,uBAAuB,EAAE,MAAM,CAAC;IAChC,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IAC3D,wBAAwB,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;CACnE;AAmED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAS/E;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWrG;AAED,qBAAa,mBAAmB;IAC9B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;gBAEd,aAAa,EAAE,MAAM;IAI3B,IAAI,IAAI,OAAO,CAAC,cAAc,CAAC;IAI/B,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IAK7E,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,GAAG,SAAS,CAAC;IAK3F,gBAAgB,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAM5D,0BAA0B,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/F,gBAAgB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAM9C,OAAO;YAgBP,QAAQ;CAGvB"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,KAAK,mBAAmB,EACzB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAE5D,MAAM,MAAM,gBAAgB,GAAG,KAAK,GAAG,WAAW,GAAG,MAAM,CAAC;AAE5D,MAAM,WAAW,cAAc;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,uBAAuB,EAAE,MAAM,CAAC;IAChC,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IAC3D,wBAAwB,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;CACnE;AAkID;;;;GAIG;AACH,wBAAsB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAS/E;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWrG;AAED,qBAAa,mBAAmB;IAC9B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;gBAEd,aAAa,EAAE,MAAM;IAI3B,IAAI,IAAI,OAAO,CAAC,cAAc,CAAC;IAI/B,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IAK7E,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,GAAG,SAAS,CAAC;IAK3F,gBAAgB,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAM5D,0BAA0B,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/F,gBAAgB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAM9C,OAAO;YAgBP,QAAQ;CAGvB"}

package/build/config.js

@@ -1,5 +1,6 @@
 import fs from "fs/promises";
 import path from "path";
+import { CONSOLIDATION_MODES, PROJECT_POLICY_SCOPES, PROTECTED_BRANCH_BEHAVIORS, } from "./project-memory-policy.js";
 const defaultConfig = {
     // Keep this at the latest schema version. When adding a new latest-schema
     // migration, bump this value in the same change so fresh installs start at
@@ -54,6 +55,46 @@ function normalizeProjectIdentityOverrides(value) {
     }
     return normalized;
 }
+function normalizeProjectMemoryPolicies(value) {
+    if (!value || typeof value !== "object") {
+        return {};
+    }
+    const normalized = {};
+    for (const [projectId, policy] of Object.entries(value)) {
+        if (!policy || typeof policy !== "object") {
+            continue;
+        }
+        const policyRecord = policy;
+        const normalizedProjectId = typeof policyRecord.projectId === "string" && policyRecord.projectId.trim().length > 0
+            ? policyRecord.projectId.trim()
+            : projectId;
+        const defaultScope = PROJECT_POLICY_SCOPES.includes(policyRecord.defaultScope)
+            ? policyRecord.defaultScope
+            : "project";
+        const consolidationMode = CONSOLIDATION_MODES.includes(policyRecord.consolidationMode)
+            ? policyRecord.consolidationMode
+            : undefined;
+        const protectedBranchBehavior = PROTECTED_BRANCH_BEHAVIORS.includes(policyRecord.protectedBranchBehavior)
+            ? policyRecord.protectedBranchBehavior
+            : undefined;
+        const protectedBranchPatterns = Array.isArray(policyRecord.protectedBranchPatterns)
+            ? policyRecord.protectedBranchPatterns
+                .filter((pattern) => typeof pattern === "string")
+                .map((pattern) => pattern.trim())
+                .filter((pattern) => pattern.length > 0)
+            : undefined;
+        normalized[projectId] = {
+            projectId: normalizedProjectId,
+            projectName: typeof policyRecord.projectName === "string" ? policyRecord.projectName : undefined,
+            defaultScope,
+            consolidationMode,
+            protectedBranchPatterns,
+            protectedBranchBehavior,
+            updatedAt: typeof policyRecord.updatedAt === "string" ? policyRecord.updatedAt : "",
+        };
+    }
+    return normalized;
+}
 /**
  * Read the schema version from a vault's config.json.
  * Works for both main vault and project vaults.
@@ -126,7 +167,7 @@ export class MnemonicConfigStore {
                 schemaVersion: normalizeSchemaVersion(parsed.schemaVersion),
                 reindexEmbedConcurrency: normalizeConcurrency(parsed.reindexEmbedConcurrency),
                 mutationPushMode: normalizeMutationPushMode(parsed.mutationPushMode),
-                projectMemoryPolicies: parsed.projectMemoryPolicies ?? {},
+                projectMemoryPolicies: normalizeProjectMemoryPolicies(parsed.projectMemoryPolicies),
                 projectIdentityOverrides: normalizeProjectIdentityOverrides(parsed.projectIdentityOverrides),
             };
         }

package/build/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,aAAa,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EACrB,0BAA0B,GAE3B,MAAM,4BAA4B,CAAC;AAapC,MAAM,aAAa,GAAmB;IACpC,0EAA0E;IAC1E,2EAA2E;IAC3E,wDAAwD;IACxD,aAAa,EAAE,KAAK;IACpB,uBAAuB,EAAE,CAAC;IAC1B,gBAAgB,EAAE,WAAW;IAC7B,qBAAqB,EAAE,EAAE;IACzB,wBAAwB,EAAE,EAAE;CAC7B,CAAC;AAEF,SAAS,sBAAsB,CAAC,KAAc;IAC5C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,aAAa,CAAC,aAAa,CAAC;IACrC,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,OAAO,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,aAAa,CAAC;AAC/E,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAc;IAC1C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACzD,OAAO,aAAa,CAAC,uBAAuB,CAAC;IAC/C,CAAC;IAED,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACtD,CAAC;AAED,SAAS,yBAAyB,CAAC,KAAc;IAC/C,QAAQ,KAAK,EAAE,CAAC;QACd,KAAK,KAAK,CAAC;QACX,KAAK,WAAW,CAAC;QACjB,KAAK,MAAM;YACT,OAAO,KAAK,CAAC;QACf;YACE,OAAO,aAAa,CAAC,gBAAgB,CAAC;IAC1C,CAAC;AACH,CAAC;AAED,SAAS,iCAAiC,CAAC,KAAc;IACvD,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,UAAU,GAA4C,EAAE,CAAC;IAC/D,KAAK,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1D,IAAI,CAAC,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC9C,SAAS;QACX,CAAC;QAED,MAAM,UAAU,GAAI,QAAqC,CAAC,UAAU,CAAC;QACrE,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrE,SAAS;QACX,CAAC;QAED,MAAM,SAAS,GAAI,QAAoC,CAAC,SAAS,CAAC;QAClE,UAAU,CAAC,SAAS,CAAC,GAAG;YACtB,UAAU,EAAE,UAAU,CAAC,IAAI,EAAE;YAC7B,SAAS,EAAE,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;SAC1D,CAAC;IACJ,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,8BAA8B,CAAC,KAAc;IACpD,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,UAAU,GAAwC,EAAE,CAAC;IAC3D,KAAK,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACxD,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC1C,SAAS;QACX,CAAC;QAED,MAAM,YAAY,GAAG,MAQpB,CAAC;QAEF,MAAM,mBAAmB,GACvB,OAAO,YAAY,CAAC,SAAS,KAAK,QAAQ,IAAI,YAAY,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC;YACpF,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,EAAE;YAC/B,CAAC,CAAC,SAAS,CAAC;QAEhB,MAAM,YAAY,GAAG,qBAAqB,CAAC,QAAQ,CAAC,YAAY,CAAC,YAAsD,CAAC;YACtH,CAAC,CAAE,YAAY,CAAC,YAAuD;YACvE,CAAC,CAAC,SAAS,CAAC;QAEd,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,QAAQ,CACpD,YAAY,CAAC,iBAAyD,CACvE;YACC,CAAC,CAAE,YAAY,CAAC,iBAA0D;YAC1E,CAAC,CAAC,SAAS,CAAC;QAEd,MAAM,uBAAuB,GAAG,0BAA0B,CAAC,QAAQ,CACjE,YAAY,CAAC,uBAAsE,CACpF;YACC,CAAC,CAAE,YAAY,CAAC,uBAAuE;YACvF,CAAC,CAAC,SAAS,CAAC;QAEd,MAAM,uBAAuB,GAAG,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,uBAAuB,CAAC;YACjF,CAAC,CAAC,YAAY,CAAC,uBAAuB;iBACnC,MAAM,CAAC,CAAC,OAAO,EAAqB,EAAE,CAAC,OAAO,OAAO,KAAK,QAAQ,CAAC;iBACnE,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;iBAChC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;YAC1C,CAAC,CAAC,SAAS,CAAC;QAEd,UAAU,CAAC,SAAS,CAAC,GAAG;YACtB,SAAS,EAAE,mBAAmB;YAC9B,WAAW,EAAE,OAAO,YAAY,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;YAChG,YAAY;YACZ,iBAAiB;YACjB,uBAAuB;YACvB,uBAAuB;YACvB,SAAS,EAAE,OAAO,YAAY,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;SACpF,CAAC;IACJ,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,SAAiB;IAC5D,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,aAAa,CAAC,CAAC;IACnE,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAgC,CAAC;QAC9D,OAAO,sBAAsB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IACtD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,aAAa,CAAC,aAAa,CAAC;IACrC,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,SAAiB,EAAE,aAAqB;IACpF,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,aAAa,CAAC,CAAC;IACnE,IAAI,QAAQ,GAA4B,EAAE,CAAC;IAC3C,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACjD,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAA4B,CAAC;IACxD,CAAC;IAAC,MAAM,CAAC;QACP,mCAAmC;IACrC,CAAC;IACD,QAAQ,CAAC,aAAa,GAAG,sBAAsB,CAAC,aAAa,CAAC,CAAC;IAC/D,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;AAClF,CAAC;AAED,MAAM,OAAO,mBAAmB;IACrB,QAAQ,CAAS;IAE1B,YAAY,aAAqB;QAC/B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,IAAI;QACR,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,SAAiB;QACtC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACpC,OAAO,MAAM,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,0BAA0B,CAAC,SAAiB;QAChD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACpC,OAAO,MAAM,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,MAA2B;QAChD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACpC,MAAM,CAAC,qBAAqB,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;QACxD,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,0BAA0B,CAAC,SAAiB,EAAE,QAAiC;QACnF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACpC,MAAM,CAAC,wBAAwB,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC;QACtD,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,aAAqB;QAC1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACpC,MAAM,CAAC,aAAa,GAAG,sBAAsB,CAAC,aAAa,CAAC,CAAC;QAC7D,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAEO,KAAK,CAAC,OAAO;QACnB,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YACtD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAA4B,CAAC;YAC1D,OAAO;gBACL,aAAa,EAAE,sBAAsB,CAAC,MAAM,CAAC,aAAa,CAAC;gBAC3D,uBAAuB,EAAE,oBAAoB,CAAC,MAAM,CAAC,uBAAuB,CAAC;gBAC7E,gBAAgB,EAAE,yBAAyB,CAAC,MAAM,CAAC,gBAAgB,CAAC;gBACpE,qBAAqB,EAAE,8BAA8B,CAAC,MAAM,CAAC,qBAAqB,CAAC;gBACnF,wBAAwB,EAAE,iCAAiC,CAAC,MAAM,CAAC,wBAAwB,CAAC;aAC7F,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,GAAG,aAAa,EAAE,CAAC;QAC9B,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,MAAsB;QAC3C,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;IACrF,CAAC;CACF"}

package/build/index.js

@@ -11,9 +11,9 @@ import { filterRelationships, mergeRelationshipsFromNotes, normalizeMergePlanSou
 import { selectRecallResults } from "./recall.js";
 import { cleanMarkdown } from "./markdown.js";
 import { MnemonicConfigStore, readVaultSchemaVersion } from "./config.js";
-import { CONSOLIDATION_MODES, PROJECT_POLICY_SCOPES, WRITE_SCOPES, resolveConsolidationMode, resolveWriteScope, } from "./project-memory-policy.js";
+import { CONSOLIDATION_MODES, PROTECTED_BRANCH_BEHAVIORS, PROJECT_POLICY_SCOPES, WRITE_SCOPES, isProtectedBranch, resolveProtectedBranchBehavior, resolveProtectedBranchPatterns, resolveConsolidationMode, resolveWriteScope, } from "./project-memory-policy.js";
 import { classifyTheme, summarizePreview, titleCaseTheme } from "./project-introspection.js";
-import { detectProject, resolveProjectIdentity } from "./project.js";
+import { detectProject, getCurrentGitBranch, resolveProjectIdentity } from "./project.js";
 import { VaultManager } from "./vault.js";
 import { Migrator } from "./migration.js";
 import { parseMemorySections } from "./import.js";
@@ -352,14 +352,6 @@ function formatProjectIdentityText(identity) {
     }
     return lines.join("\n");
 }
-async function getProjectPolicyScope(cwd) {
-    const project = await resolveProject(cwd);
-    if (!project) {
-        return undefined;
-    }
-    const policy = await configStore.getProjectPolicy(project.id);
-    return policy?.defaultScope;
-}
 function describeLifecycle(lifecycle) {
     return `lifecycle: ${lifecycle}`;
 }
@@ -454,6 +446,49 @@ function formatAskForWriteScope(project, unadopted = false) {
         "To avoid being asked again: call `set_project_memory_policy` with your preferred scope.",
     ].join("\n");
 }
+function formatAskForProtectedBranch(project, branch, patterns) {
+    const projectLabel = project ? `${project.name} (${project.id})` : "this context";
+    return [
+        `Protected branch check for ${projectLabel}: current branch \`${branch}\` matches ${patterns.join(", ")}.`,
+        "Choose how to proceed:",
+        "- One-time override: call `remember` again with `allowProtectedBranch: true`",
+        "- Persist policy: call `set_project_memory_policy` with `protectedBranchBehavior: \"block\"`",
+        "- Persist policy: call `set_project_memory_policy` with `protectedBranchBehavior: \"allow\"`",
+        "",
+        "Optional: set `protectedBranchPatterns` to customize which branches are protected.",
+    ].join("\n");
+}
+function formatProtectedBranchBlocked(project, branch, patterns) {
+    const projectLabel = project ? `${project.name} (${project.id})` : "this context";
+    return [
+        `Auto-commit blocked for ${projectLabel}: current branch \`${branch}\` matches protected patterns ${patterns.join(", ")}.`,
+        "Policy is set to `protectedBranchBehavior: \"block\"`.",
+        "To proceed once, call `remember` again with `allowProtectedBranch: true`.",
+        "To change the default, call `set_project_memory_policy` with `protectedBranchBehavior: \"allow\"`.",
+    ].join("\n");
+}
+async function shouldBlockProtectedBranchCommit(options) {
+    const { cwd, writeScope, automaticCommit, project, policy, allowProtectedBranch } = options;
+    if (!cwd || writeScope !== "project" || !automaticCommit) {
+        return { blocked: false };
+    }
+    const branch = await getCurrentGitBranch(cwd);
+    if (!branch) {
+        return { blocked: false };
+    }
+    const patterns = resolveProtectedBranchPatterns(policy);
+    if (!isProtectedBranch(branch, patterns) || allowProtectedBranch) {
+        return { blocked: false };
+    }
+    const behavior = resolveProtectedBranchBehavior(policy);
+    if (behavior === "allow") {
+        return { blocked: false };
+    }
+    const message = behavior === "block"
+        ? formatProtectedBranchBlocked(project, branch, patterns)
+        : formatAskForProtectedBranch(project, branch, patterns);
+    return { blocked: true, message };
+}
 async function embedMissingNotes(storage, noteIds, force = false) {
     const notes = noteIds
         ? (await Promise.all(noteIds.map((id) => storage.readNote(id)))).filter(Boolean)
@@ -1056,7 +1091,9 @@ server.registerTool("remember", {
         "- Multiple related notes have accumulated — use `consolidate` to merge them\n\n" +
         "After storing: consider whether this note relates to any note you recalled earlier in this session. " +
         "If so, call `relate` to link them while you still have context.\n\n" +
-        "Side effects: writes note + embedding files, git commits. Returns persistence status.",
+        "Side effects: writes note + embedding files, git commits. " +
+        "When project-vault writes target protected branches, policy may ask or block before writing. " +
+        "Returns persistence status.",
     annotations: {
         readOnlyHint: false,
         destructiveHint: false,
@@ -1081,18 +1118,35 @@ server.registerTool("remember", {
             .optional()
             .describe("Where to store: 'project' = shared project vault (.mnemonic/), " +
             "'global' = private main vault. When omitted, uses the project's saved policy or defaults to 'project'."),
+        allowProtectedBranch: z
+            .boolean()
+            .optional()
+            .describe("One-time override for protected branch checks. " +
+            "When true, remember can commit on a protected branch without changing project policy."),
     }),
     outputSchema: RememberResultSchema,
-}, async ({ title, content, tags, lifecycle, summary, cwd, scope }) => {
+}, async ({ title, content, tags, lifecycle, summary, cwd, scope, allowProtectedBranch = false }) => {
     const project = await resolveProject(cwd);
     const cleanedContent = await cleanMarkdown(content);
-    const policyScope = await getProjectPolicyScope(cwd);
+    const policy = project ? await configStore.getProjectPolicy(project.id) : undefined;
+    const policyScope = policy?.defaultScope;
     const projectVaultExists = cwd ? Boolean(await vaultManager.getProjectVaultIfExists(cwd)) : true;
     const writeScope = resolveWriteScope(scope, policyScope, Boolean(project), projectVaultExists);
     if (writeScope === "ask") {
         const unadopted = !projectVaultExists && !policyScope;
         return { content: [{ type: "text", text: formatAskForWriteScope(project, unadopted) }], isError: true };
     }
+    const protectedBranchCheck = await shouldBlockProtectedBranchCommit({
+        cwd,
+        writeScope,
+        automaticCommit: scope === undefined,
+        project,
+        policy,
+        allowProtectedBranch,
+    });
+    if (protectedBranchCheck.blocked) {
+        return { content: [{ type: "text", text: protectedBranchCheck.message ?? "Protected branch policy blocked this commit." }], isError: true };
+    }
     const vault = await resolveWriteVault(cwd, writeScope);
     const id = makeId(title);
     const now = new Date().toISOString();
@@ -1158,10 +1212,11 @@ server.registerTool("remember", {
 // ── set_project_memory_policy ─────────────────────────────────────────────────
 server.registerTool("set_project_memory_policy", {
     title: "Set Project Memory Policy",
-    description: "Set the default write scope and consolidation mode for a project.\n\n" +
+    description: "Set the default write scope, consolidation mode, and protected-branch behavior for a project.\n\n" +
         "Use this when:\n" +
         "- The user wants all memories for a project to go to a specific vault by default\n" +
-        "- The current 'ask' behavior is inconvenient and should be automated\n\n" +
+        "- The current 'ask' behavior is inconvenient and should be automated\n" +
+        "- Protected branches should prompt, block, or allow project-vault commits by default\n\n" +
         "Do not use this when:\n" +
         "- You just need to store a single memory with a specific scope — pass `scope` to `remember` instead\n\n" +
         "Side effects: writes to main vault config.json, git commits and pushes.",
@@ -1173,42 +1228,79 @@ server.registerTool("set_project_memory_policy", {
     },
     inputSchema: z.object({
         cwd: z.string().describe("Absolute path to the project working directory"),
-        defaultScope: z.enum(PROJECT_POLICY_SCOPES).describe("Default storage: 'project' = shared .mnemonic/ vault, 'global' = private main vault, 'ask' = prompt each time"),
+        defaultScope: z.enum(PROJECT_POLICY_SCOPES).optional().describe("Default storage: 'project' = shared .mnemonic/ vault, 'global' = private main vault, 'ask' = prompt each time"),
         consolidationMode: z.enum(CONSOLIDATION_MODES).optional().describe("Default consolidation mode: 'supersedes' preserves history (default), 'delete' removes sources immediately"),
+        protectedBranchBehavior: z.enum(PROTECTED_BRANCH_BEHAVIORS).optional().describe("Behavior for protected-branch matches during project-vault remember writes: 'ask', 'block', or 'allow'"),
+        protectedBranchPatterns: z.array(z.string()).optional().describe("Protected branch glob patterns. Defaults to [\"main\", \"master\", \"release*\"] when not set"),
     }),
     outputSchema: PolicyResultSchema,
-}, async ({ cwd, defaultScope, consolidationMode }) => {
+}, async ({ cwd, defaultScope, consolidationMode, protectedBranchBehavior, protectedBranchPatterns }) => {
     const project = await resolveProject(cwd);
     if (!project) {
         return { content: [{ type: "text", text: `Could not detect a project for: ${cwd}` }], isError: true };
     }
+    if (defaultScope === undefined
+        && consolidationMode === undefined
+        && protectedBranchBehavior === undefined
+        && protectedBranchPatterns === undefined) {
+        return {
+            content: [{
+                    type: "text",
+                    text: "No policy fields provided. Set at least one of: defaultScope, consolidationMode, protectedBranchBehavior, protectedBranchPatterns.",
+                }],
+            isError: true,
+        };
+    }
+    const existing = await configStore.getProjectPolicy(project.id);
+    const effectiveDefaultScope = defaultScope ?? existing?.defaultScope ?? "project";
+    const effectiveConsolidationMode = consolidationMode ?? existing?.consolidationMode;
+    const effectiveProtectedBranchBehavior = protectedBranchBehavior ?? existing?.protectedBranchBehavior;
+    const effectiveProtectedBranchPatterns = protectedBranchPatterns
+        ? protectedBranchPatterns.map((pattern) => pattern.trim()).filter((pattern) => pattern.length > 0)
+        : existing?.protectedBranchPatterns;
     const now = new Date().toISOString();
     const policy = {
         projectId: project.id,
         projectName: project.name,
-        defaultScope,
-        consolidationMode,
+        defaultScope: effectiveDefaultScope,
+        consolidationMode: effectiveConsolidationMode,
+        protectedBranchBehavior: effectiveProtectedBranchBehavior,
+        protectedBranchPatterns: effectiveProtectedBranchPatterns,
         updatedAt: now,
     };
     await configStore.setProjectPolicy(policy);
-    const modeStr = consolidationMode ? `, consolidationMode=${consolidationMode}` : "";
+    const modeStr = effectiveConsolidationMode ? `, consolidationMode=${effectiveConsolidationMode}` : "";
+    const branchBehaviorStr = effectiveProtectedBranchBehavior
+        ? `, protectedBranchBehavior=${effectiveProtectedBranchBehavior}`
+        : "";
+    const branchPatternsStr = effectiveProtectedBranchPatterns && effectiveProtectedBranchPatterns.length > 0
+        ? `, protectedBranchPatterns=${effectiveProtectedBranchPatterns.join("|")}`
+        : "";
     const commitBody = formatCommitBody({
         projectName: project.name,
-        description: `Default scope: ${defaultScope}${modeStr ? `\nConsolidation mode: ${consolidationMode}` : ""}`,
+        description: `Default scope: ${effectiveDefaultScope}` +
+            `${effectiveConsolidationMode ? `\nConsolidation mode: ${effectiveConsolidationMode}` : ""}` +
+            `${effectiveProtectedBranchBehavior ? `\nProtected branch behavior: ${effectiveProtectedBranchBehavior}` : ""}` +
+            `${effectiveProtectedBranchPatterns && effectiveProtectedBranchPatterns.length > 0
+                ? `\nProtected branch patterns: ${effectiveProtectedBranchPatterns.join(", ")}`
+                : ""}`,
     });
-    await vaultManager.main.git.commit(`policy: ${project.name} default scope ${defaultScope}`, ["config.json"], commitBody);
+    await vaultManager.main.git.commit(`policy: ${project.name} default scope ${effectiveDefaultScope}`, ["config.json"], commitBody);
     await pushAfterMutation(vaultManager.main);
     const structuredContent = {
         action: "policy_set",
         project: { id: project.id, name: project.name },
-        defaultScope,
-        consolidationMode,
+        defaultScope: effectiveDefaultScope,
+        consolidationMode: effectiveConsolidationMode,
+        protectedBranchBehavior: effectiveProtectedBranchBehavior,
+        protectedBranchPatterns: effectiveProtectedBranchPatterns,
         timestamp: now,
     };
     return {
         content: [{
                 type: "text",
-                text: `Project memory policy set for ${project.name}: defaultScope=${defaultScope}${modeStr}`,
+                text: `Project memory policy set for ${project.name}: defaultScope=${effectiveDefaultScope}` +
+                    `${modeStr}${branchBehaviorStr}${branchPatternsStr}`,
             }],
         structuredContent,
     };
@@ -1216,7 +1308,7 @@ server.registerTool("set_project_memory_policy", {
 // ── get_project_memory_policy ─────────────────────────────────────────────────
 server.registerTool("get_project_memory_policy", {
     title: "Get Project Memory Policy",
-    description: "Show the saved default write scope and consolidation mode for a project.\n\n" +
+    description: "Show the saved default write scope, consolidation mode, and protected-branch settings for a project.\n\n" +
         "Use this when:\n" +
         "- Checking what the current storage default is before changing it\n" +
         "- Debugging why memories are landing in an unexpected vault\n\n" +
@@ -1254,12 +1346,22 @@ server.registerTool("get_project_memory_policy", {
         project: { id: project.id, name: project.name },
         defaultScope: policy.defaultScope,
         consolidationMode: policy.consolidationMode,
+        protectedBranchBehavior: policy.protectedBranchBehavior,
+        protectedBranchPatterns: policy.protectedBranchPatterns,
         updatedAt: policy.updatedAt,
     };
+    const details = [
+        `defaultScope=${policy.defaultScope}`,
+        policy.consolidationMode ? `consolidationMode=${policy.consolidationMode}` : undefined,
+        policy.protectedBranchBehavior ? `protectedBranchBehavior=${policy.protectedBranchBehavior}` : undefined,
+        policy.protectedBranchPatterns && policy.protectedBranchPatterns.length > 0
+            ? `protectedBranchPatterns=${policy.protectedBranchPatterns.join("|")}`
+            : undefined,
+    ].filter(Boolean).join(", ");
     return {
         content: [{
                 type: "text",
-                text: `Project memory policy for ${project.name}: defaultScope=${policy.defaultScope} (updated ${policy.updatedAt})`,
+                text: `Project memory policy for ${project.name}: ${details} (updated ${policy.updatedAt})`,
             }],
         structuredContent,
     };