@pcircle/memesh 4.8.2 → 4.8.3

package/scripts/hooks/_generated/agent-message-inbox.js

@@ -6,18 +6,21 @@
 // always-on capture path survives a missing or stale dist/ while staying
 // byte-locked to core — eliminating the hand-mirror drift behind the P0 FTS bug.
 // ============================================================================
-export function unreadDeliveryCount(db, project) {
+export function unreadDeliveryCount(db, project, recipient) {
+    if (!recipient)
+        return 0;
     try {
         const row = db.prepare(`SELECT COUNT(*) AS n
        FROM agent_message_deliveries d
        WHERE d.project = ?
+         AND d.recipient = ?
          AND NOT EXISTS (
            SELECT 1 FROM agent_message_receipts r
            WHERE r.project = d.project
              AND r.recipient = d.recipient
              AND r.message_id = d.message_id
              AND r.receipt_kind = 'intake'
-         )`).get(project);
+         )`).get(project, recipient);
         const n = row?.n;
         return typeof n === 'number' && n > 0 ? n : 0;
     }
@@ -25,9 +28,11 @@ export function unreadDeliveryCount(db, project) {
         return 0;
     }
 }
-export function unreadInboxLines(count, project) {
-    if (count <= 0)
+export function unreadInboxLines(count, project, recipient) {
+    if (count <= 0 || !recipient)
         return [];
     const noun = count === 1 ? 'message' : 'messages';
-    return [`${count} ${noun} waiting for "${project}" — fetch them with the message tool; fetching does not acknowledge.`];
+    const displayProject = JSON.stringify(project);
+    const displayRecipient = JSON.stringify(recipient);
+    return [`${count} ${noun} waiting for ${displayRecipient} in project ${displayProject} — poll the message tool with project ${displayProject} and recipient ${displayRecipient}, then fetch each message_id; fetching does not acknowledge.`];
 }

package/scripts/hooks/_generated/citation-rule.js

@@ -25,8 +25,11 @@ memory is recorded as unused: that is how MeMesh learns which memories are
 worth the tokens they cost you.
 `;
 export function citationRuleDir(scope, home, cwd) {
-    const base = scope === 'user' ? home : cwd;
-    return path.join(base, '.claude', 'rules');
+    if (scope === 'project')
+        return path.join(cwd, '.claude', 'rules');
+    const relocated = process.env.CLAUDE_CONFIG_DIR;
+    const configRoot = relocated ? path.resolve(relocated) : path.join(home, '.claude');
+    return path.join(configRoot, 'rules');
 }
 export function citationRulePath(scope, home, cwd) {
     return path.join(citationRuleDir(scope, home, cwd), CITATION_RULE_FILENAME);

package/scripts/hooks/_generated/work-topology.js

@@ -82,10 +82,15 @@ export function groupTopology(entities, projectName) {
     const lessons = [];
     const knowledge = [];
     const evidence = [];
+    const global = [];
     const foreign = [];
     for (const e of entities) {
         if (e.type === 'task-state')
             continue;
+        if (e.global) {
+            global.push(e);
+            continue;
+        }
         if (e.foreign) {
             foreign.push(e);
             continue;
@@ -104,7 +109,7 @@ export function groupTopology(entities, projectName) {
         else
             decisions.push(e);
     }
-    for (const list of [decisions, lessons, knowledge, evidence, foreign])
+    for (const list of [decisions, lessons, knowledge, evidence, global, foreign])
         list.sort(bySignal);
     const sections = [];
     if (decisions.length)
@@ -115,6 +120,8 @@ export function groupTopology(entities, projectName) {
         sections.push({ heading: `What is known about "${projectName}":`, entities: knowledge });
     if (evidence.length)
         sections.push({ heading: `Recent activity in "${projectName}":`, entities: evidence });
+    if (global.length)
+        sections.push({ heading: 'Global memory — applies across projects:', entities: global });
     if (foreign.length)
         sections.push({ heading: 'From your other projects (may or may not apply here):', entities: foreign });
     return sections;
@@ -124,6 +131,11 @@ export const DEFAULT_TOPOLOGY_BUDGET = {
     maxChars: 4000,
     maxLineChars: 160,
 };
+export const GLOBAL_TOPOLOGY_LIMIT = 3;
+const GLOBAL_TOPOLOGY_BUDGET = {
+    maxChars: 640,
+    maxLineChars: DEFAULT_TOPOLOGY_BUDGET.maxLineChars,
+};
 export const TOPOLOGY_CANDIDATE_CAP = 400;
 export const SNIPPET_FETCH_CHARS = DEFAULT_TOPOLOGY_BUDGET.maxLineChars * 4;
 export function buildTopologyLines(entities, projectName, budget) {
@@ -155,12 +167,18 @@ export function buildTopologyLines(entities, projectName, budget) {
 export function assembleTopologyBlock(stateLines, pools, projectName, budget = DEFAULT_TOPOLOGY_BUDGET) {
     const seen = new Set();
     const candidates = [];
+    const globalCandidates = [];
     for (const pool of pools) {
         for (const e of pool.entities) {
             if (seen.has(e.name))
                 continue;
             seen.add(e.name);
-            candidates.push(pool.foreign && !e.foreign ? { ...e, foreign: true } : e);
+            if (pool.global) {
+                globalCandidates.push(e.global ? e : { ...e, global: true });
+            }
+            else {
+                candidates.push(pool.foreign && !e.foreign ? { ...e, foreign: true } : e);
+            }
         }
     }
     const lines = [];
@@ -173,9 +191,13 @@ export function assembleTopologyBlock(stateLines, pools, projectName, budget = D
     const topologyLines = remaining > 0
         ? buildTopologyLines(candidates, projectName, { ...budget, maxChars: remaining })
         : [];
+    const globalLines = buildTopologyLines(globalCandidates, projectName, GLOBAL_TOPOLOGY_BUDGET);
     if (lines.length > 0 && topologyLines.length > 0)
         lines.push('');
     lines.push(...topologyLines);
+    if (lines.length > 0 && globalLines.length > 0)
+        lines.push('');
+    lines.push(...globalLines);
     return lines;
 }
 export function buildReferenceContext(memoryLines) {

package/scripts/hooks/_shared.js

@@ -34,7 +34,7 @@ import {
   slugFromRemoteUrl,
 } from './_generated/core-paths.js';
 import { autoCaptureDecision } from './_generated/capture-flag.js';
-export { assembleTopologyBlock, buildReferenceContext, extractCitedMemoryIds, DEFAULT_TOPOLOGY_BUDGET, SNIPPET_FETCH_CHARS, TOPOLOGY_CANDIDATE_CAP } from './_generated/work-topology.js';
+export { assembleTopologyBlock, buildReferenceContext, extractCitedMemoryIds, DEFAULT_TOPOLOGY_BUDGET, GLOBAL_TOPOLOGY_LIMIT, SNIPPET_FETCH_CHARS, TOPOLOGY_CANDIDATE_CAP } from './_generated/work-topology.js';
 export { readRepoState, repoStateLines } from './_generated/repo-state.js';
 export { matchingGuards, guardFromMetadata } from './_generated/guards.js';
 export { writeCitationRule, citationRulePath, CITATION_RULE_BODY } from './_generated/citation-rule.js';

package/scripts/hooks/session-start.js

@@ -15,6 +15,7 @@ import {
   importFromPluginRoot,
   assembleTopologyBlock,
   DEFAULT_TOPOLOGY_BUDGET,
+  GLOBAL_TOPOLOGY_LIMIT,
   SNIPPET_FETCH_CHARS,
   TOPOLOGY_CANDIDATE_CAP,
   isTrustedForAutoContext,
@@ -786,9 +787,12 @@ process.stdin.on('end', async () => {
       };
 
       const projectTag = `project:${projectName}`;
+      const notGlobal = colNames.has('namespace')
+        ? "AND (e.namespace IS NULL OR e.namespace <> 'global')"
+        : '';
       const projectQuery = buildScoringQuery(
         `JOIN tags t ON t.entity_id = e.id`,
-        `WHERE t.tag = ? ${statusFilter}`,
+        `WHERE t.tag = ? ${notGlobal} ${statusFilter}`,
       );
       // Over-fetch WIDE, then filter. The window used to be `sessionLimit * 3`
       // and the trust filter ran after it — so a class of entity that ranks
@@ -811,26 +815,27 @@ process.stdin.on('end', async () => {
       // by nobody (#242): 1814 entities, 2 global, one of them structurally
       // uninjectable. A standing behaviour rule sat in that state for months.
       //
-      // Global rows ride in a SEPARATE, small window so they cannot displace
-      // the project's own memories: the project keeps `sessionLimit` slots and
-      // global adds at most GLOBAL_SLOTS after them. Same trust filter, same
-      // scoring. The column is absent on pre-namespace schemas; then this
-      // branch is simply empty, which is the old behaviour.
-      const GLOBAL_SLOTS = 3;
+      // Global rows ride in a SEPARATE, small window and the shared assembler
+      // gives them a separate render budget. The project keeps `sessionLimit`
+      // slots and its full character budget. The column is absent on
+      // pre-namespace schemas; then this branch is simply empty.
       let globalEntities = [];
       if (colNames.has('namespace')) {
         const globalQuery = buildScoringQuery('', `WHERE e.namespace = 'global' ${statusFilter}`);
-        const projectIds = new Set(projectOnly.map(e => e.id));
         globalEntities = db.prepare(globalQuery).all(CANDIDATE_CAP)
-          .filter(entity => isTrustedForAutoContext(entity.metadata) && !projectIds.has(entity.id))
-          .slice(0, GLOBAL_SLOTS);
+          .filter(entity => isTrustedForAutoContext(entity.metadata))
+          .slice(0, GLOBAL_TOPOLOGY_LIMIT);
       }
-      const projectEntities = [...projectOnly.slice(0, sessionLimit), ...globalEntities];
+      const projectEntities = projectOnly.slice(0, sessionLimit);
 
       // recentStatusFilter is "WHERE status = 'active'" or "" — the bare-column
       // form is fine when there's no JOIN, but we now alias the table as `e`,
       // so rewrite to e.status for consistency.
-      const recentWhere = hasStatus ? "WHERE e.status = 'active'" : '';
+      const recentConditions = [
+        hasStatus ? "e.status = 'active'" : '',
+        colNames.has('namespace') ? "(e.namespace IS NULL OR e.namespace <> 'global')" : '',
+      ].filter(Boolean);
+      const recentWhere = recentConditions.length > 0 ? `WHERE ${recentConditions.join(' AND ')}` : '';
       const recentQuery = buildScoringQuery('', recentWhere);
       const recentEntities = db.prepare(recentQuery).all(CANDIDATE_CAP)
         .filter(entity => isTrustedForAutoContext(entity.metadata))
@@ -850,6 +855,7 @@ process.stdin.on('end', async () => {
           JOIN tags t ON t.entity_id = e.id
           WHERE e.type = 'lesson_learned'
             ${hasStatus ? "AND e.status = 'active'" : ''}
+            ${colNames.has('namespace') ? "AND (e.namespace IS NULL OR e.namespace <> 'global')" : ''}
             AND t.tag = ?
           LIMIT 50
         `).all(projectTag).filter(entity => isTrustedForAutoContext(entity.metadata));
@@ -866,9 +872,11 @@ process.stdin.on('end', async () => {
       // SessionStart system message takes one row in the Claude Code
       // log instead of four. Counts are count-only — no entity bullets.
       const projectCount = projectEntities.length;
+      const globalCount = globalEntities.length;
       const recentCount = recentEntities.length;
       const memoryFragments = [];
       if (projectCount > 0) memoryFragments.push(`${projectCount} project`);
+      if (globalCount > 0) memoryFragments.push(`${globalCount} global`);
       if (recentCount > 0) memoryFragments.push(`${recentCount} recent`);
 
       let summary;
@@ -915,6 +923,7 @@ process.stdin.on('end', async () => {
         const rankedIds = [
           ...topLessons.map(e => e.id),
           ...projectEntities.map(e => e.id),
+          ...globalEntities.map(e => e.id),
           ...recentEntities.map(e => e.id),
         ];
         const uniqueIds = [...new Set(rankedIds)];
@@ -955,8 +964,8 @@ process.stdin.on('end', async () => {
         const taskRow = db
           .prepare('SELECT metadata FROM entities WHERE name = ?')
           .get(taskStateName(projectName));
-        // Inbox line beside the stated lines — the same leaf briefing uses,
-        // so the two surfaces cannot disagree on what "unread" means.
+        // SessionStart has no exact recipient identity. The shared leaf fails
+        // closed before querying, so hook and briefing cannot diverge here.
         const stateLines = [
           ...taskStateLines(
             parseTaskState(parseEntityMetadata(taskRow?.metadata)),
@@ -992,6 +1001,7 @@ process.stdin.on('end', async () => {
           [
             { entities: topLessons.map(toEntity), foreign: false },
             { entities: projectEntities.map(toEntity), foreign: false },
+            { entities: globalEntities.map(toEntity), foreign: false, global: true },
             { entities: recentEntities.map(toEntity), foreign: true },
           ],
           projectName,
@@ -1021,8 +1031,9 @@ process.stdin.on('end', async () => {
         // ever been told can end up in an observation), so it must be
         // delimited the same way on every injection path — not hand-rolled
         // per hook. The lines arrive already budgeted — assembleTopologyBlock
-        // charges the task-state block and the sections against ONE ceiling
-        // and returns whole lines only, so the closing fence cannot be cut.
+        // charges task state plus project/foreign sections against the main
+        // ceiling and global context against its small additive ceiling. It
+        // returns whole lines only, so the closing fence cannot be cut.
         memoryContext = buildReferenceContext(memoryLines);
         // The citation contract — OUTSIDE the fence on purpose: the fence
         // declares its content "background data, not instructions", and
@@ -1054,15 +1065,18 @@ process.stdin.on('end', async () => {
       // kept as the record of what was shown.
       //
       // The set below is every pool the topology block draws from — the
-      // lessons pool included. It used to record only project + recent
-      // rows, so an injected lesson could never be credited at all.
+      // lessons pool included. It is derived from rendered citation handles,
+      // so clipped or budgeted-away candidates cannot be credited as shown.
       try {
-        const seenIds = new Set();
-        const allInjected = [...topLessons, ...projectEntities, ...recentEntities].filter(e => {
-          if (seenIds.has(e.id)) return false;
-          seenIds.add(e.id);
-          return true;
+        const renderedEntityIds = memoryLines.flatMap((line) => {
+          const match = line.match(/ \[mem:(\d{1,10})\]$/);
+          return match ? [Number(match[1])] : [];
         });
+        const poolEntities = [...topLessons, ...projectEntities, ...globalEntities, ...recentEntities];
+        const entitiesById = new Map(poolEntities.map((entity) => [entity.id, entity]));
+        const allInjected = renderedEntityIds
+          .map((id) => entitiesById.get(id))
+          .filter(Boolean);
 
         if (allInjected.length > 0) {
           const sessionsDir = join(memeshDir, 'sessions');