memoir-cli 3.16.2 → 3.16.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "memoir-cli",
-  "version": "3.16.2",
+  "version": "3.16.4",
   "mcpName": "io.github.camgitt/memoir",
   "description": "Portable, project-scoped memory and session handoffs for coding agents. Readable files, MCP recall, and optional user-passphrase encrypted backups.",
   "main": "src/index.js",

package/src/adapters/index.js

@@ -8,6 +8,7 @@ import os from 'os';
 import chalk from 'chalk';
 import { shouldIgnoreProject } from '../context/capture.js';
 import { vscodeUserDir, vscodeGlobalStorage, xdgConfigDir } from '../utils/platform.js';
+import { isSideCarDir } from '../context/transcripts.js';
 
 const home = os.homedir();
 
@@ -57,8 +58,8 @@ export const adapters = [
         // Allow directory traversal but skip dirs that only contain session data
         try {
           if (nodeFs.statSync(src).isDirectory()) {
-            // Skip subagents and UUID-named session dirs (contain large .jsonl files, no .md)
-            if (basename === 'subagents') return false;
+            // Skip agent side-car and UUID-named session dirs (contain large .jsonl files, no .md)
+            if (isSideCarDir(basename)) return false;
             // UUID pattern: 8-4-4-4-12 hex chars
             if (/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/.test(basename)) return false;
             return true;

package/src/commands/snapshot.js

@@ -8,6 +8,7 @@ import gradient from 'gradient-string';
 import { getConfig, getGeminiApiKey } from '../config.js';
 import { syncToLocal, syncToGit } from '../providers/index.js';
 import { saveHandoff } from '../context/handoffs.js';
+import { isSideCarDir, isUserTranscript } from '../context/transcripts.js';
 
 const home = os.homedir();
 
@@ -22,8 +23,12 @@ function findClaudeSessions() {
     for (const entry of entries) {
       const full = path.join(dir, entry.name);
       if (entry.isDirectory()) {
+        // Same side-car directories capture.js refuses. Without this, every
+        // agent-<id>.jsonl under subagents/ is collected and its orchestrator
+        // prompt is sent to the summariser as "what they asked for".
+        if (isSideCarDir(entry.name)) continue;
         scanDir(full);
-      } else if (entry.name.endsWith('.jsonl') && !entry.name.includes('subagent')) {
+      } else if (isUserTranscript(entry.name)) {
         const stat = fs.statSync(full);
         sessions.push({ path: full, mtime: stat.mtimeMs, size: stat.size });
       }

package/src/context/capture.js

@@ -3,6 +3,7 @@ import path from 'path';
 import os from 'os';
 import { execFileSync } from 'child_process';
 import { scanForSecrets, redactSecrets } from '../security/scanner.js';
+import { isSideCarDir, isUserTranscript } from './transcripts.js';
 
 const home = os.homedir();
 
@@ -47,9 +48,9 @@ export function findClaudeSessions() {
         // agent-<id>.jsonl, not *subagent*), so USER_NOTE_RE minted
         // decisions out of system prompts. Live proof: three of the
         // author's own pinned decisions were subagent-prompt fragments.
-        if (entry.name === 'subagents' || entry.name === 'workflows' || entry.name === 'tool-results') continue;
+        if (isSideCarDir(entry.name)) continue;
         scanDir(full);
-      } else if (entry.name.endsWith('.jsonl') && !entry.name.includes('subagent') && !entry.name.startsWith('agent-')) {
+      } else if (isUserTranscript(entry.name)) {
         try {
           const stat = fs.statSync(full);
           // Skip files older than 7 days for performance

package/src/context/transcripts.js

@@ -0,0 +1,42 @@
+// One definition of "this .jsonl is an agent transcript, not the user talking."
+//
+// Claude Code writes subagent transcripts as `agent-<id>.jsonl` inside a
+// `subagents/` directory. The FIRST user message in one of those files is the
+// orchestrator's prompt ("You are a software architect. Note that ..."), not
+// anything a person typed. Treating them as user speech has already produced
+// two distinct failures in this codebase:
+//
+//   1. src/context/capture.js minted pinned "decisions" out of system prompts —
+//      three of the author's own were subagent-prompt fragments.
+//   2. src/commands/snapshot.js collected them into a handoff summary whose
+//      prompt is labelled "User messages (what they asked for)" and POSTed to
+//      generativelanguage.googleapis.com, so orchestrator prompts left the
+//      machine entirely.
+//
+// Both were written as `!name.includes('subagent')`, which never matches
+// `agent-<id>.jsonl` — the substring is "agent-", not "subagent". capture.js
+// was fixed in place; snapshot.js kept the defeated test for three more weeks
+// because the predicate was spelled four different ways across three files.
+// It is spelled once here now.
+
+/** Per-session side directories that never contain user speech. */
+const SIDE_CAR_DIRS = new Set(['subagents', 'workflows', 'tool-results']);
+
+/** True for a directory that holds agent-generated transcripts, not user turns. */
+export function isSideCarDir(name) {
+  return SIDE_CAR_DIRS.has(name);
+}
+
+/**
+ * True for a .jsonl file that is an agent transcript rather than a user
+ * session. Covers both the real filename (`agent-<id>.jsonl`) and the older
+ * `*subagent*` spelling, so a directory walk that reaches one anyway is safe.
+ */
+export function isAgentTranscript(name) {
+  return name.startsWith('agent-') || name.includes('subagent');
+}
+
+/** True for a .jsonl file safe to read as a record of what the user asked for. */
+export function isUserTranscript(name) {
+  return name.endsWith('.jsonl') && !isAgentTranscript(name);
+}

package/src/mcp.js

@@ -483,15 +483,28 @@ server.tool(
 
 server.tool(
   'memoir_session',
-  'Show the current session state — goals, next actions, open questions, recent decisions, recent sessions across machines. Use this to catch up at the start of a session, or when you need to orient yourself on what was decided.',
-  {},
-  async () => {
-    const state = sessionView(await readSession());
+  'Show the current session state — goals, next actions, open questions, recent decisions, recent sessions across machines. Use this to catch up at the start of a session, or when you need to orient yourself on what was decided. Pass project to narrow it to one project, or tag to narrow it to items whose text carries a [tag] prefix.',
+  {
+    project: z.string().optional().describe('Project directory or identity. Defaults to the current working project.'),
+    tag: z.string().optional().describe('Show only items whose text starts with a bracketed tag, e.g. "gathered" matches "[gathered — CAM] …". Case-insensitive.'),
+  },
+  async ({ project, tag }) => {
+    const state = sessionView(await readSession(), project ? { project } : {});
     const machine = await getMachineId();
-    const goals = state.current.goals.map(g => `- ${g.text}`).join('\n') || '(none)';
-    const nexts = state.current.next_actions.map(n => `- [ ] ${n.text}`).join('\n') || '(none)';
-    const questions = state.current.open_questions.map(q => `- ${q.text}`).join('\n') || '(none)';
-    const decisions = state.current.decisions.filter(d => visibleMemory(d)).slice(0, 5).map(d => {
+    // Untagged items are visible in every project by design; a [tag] prefix in
+    // the text is the only project signal many sessions actually carry.
+    const tagged = items => {
+      if (!tag) return items;
+      const want = tag.toLowerCase().replace(/^\[|\]$/g, '');
+      return items.filter(i => {
+        const m = String(i?.text || '').match(/^\s*\[([^\]]+)\]/);
+        return m && m[1].toLowerCase().includes(want);
+      });
+    };
+    const goals = tagged(state.current.goals).map(g => `- ${g.text}`).join('\n') || '(none)';
+    const nexts = tagged(state.current.next_actions).map(n => `- [ ] ${n.text}`).join('\n') || '(none)';
+    const questions = tagged(state.current.open_questions).map(q => `- ${q.text}`).join('\n') || '(none)';
+    const decisions = tagged(state.current.decisions.filter(d => visibleMemory(d, project ? { project } : {}))).slice(0, 5).map(d => {
       let line = `- ${d.text}`;
       if (d.why) line += ` — *${d.why}*`;
       return line;

package/src/memory/scope.js

@@ -5,6 +5,14 @@ import crypto from 'crypto';
 import { execFileSync } from 'child_process';
 
 const cache = new Map();
+
+// Records written before the home directory got an explicit key carry the hash
+// of the empty string. Treat that as an alias for home so they stay visible.
+const LEGACY_HOME_ID = 'local:' + crypto.createHash('sha256').update('').digest('hex').slice(0, 32);
+export function canonicalIdentity(id) {
+  return id === LEGACY_HOME_ID ? projectIdentity(os.homedir()) : id;
+}
+
 export function projectIdentity(project = process.env.MEMOIR_PROJECT_ROOT || process.cwd()) {
   if (project === 'shared') return 'shared';
   if (/^(git|local):[a-f0-9]{32}$/.test(project)) return project;
@@ -14,7 +22,11 @@ export function projectIdentity(project = process.env.MEMOIR_PROJECT_ROOT || pro
   if (old && Date.now() - old.at < 60_000) return old.id;
   let home = os.homedir();
   try { home = fs.realpathSync(home); } catch {}
-  let key = path.relative(home, absolute).replace(/\\/g, '/');
+  // The home directory itself is a legitimate working root for people who run
+  // their agent from ~. path.relative(home, home) is '', and hashing '' gives
+  // every such user the same degenerate id (sha256 of the empty string), so
+  // name it explicitly instead.
+  let key = path.relative(home, absolute).replace(/\\/g, '/') || '~';
   let kind = 'local';
   try {
     const remote = execFileSync('git', ['config', '--get', 'remote.origin.url'], { cwd: absolute, encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'], timeout: 2000 }).trim();
@@ -44,9 +56,9 @@ export function memoryVisibility({ project = process.env.MEMOIR_PROJECT_ROOT ||
       if (item.claudeProjectKey !== currentKey && item.claudeProjectKey !== sharedKey) return false;
     }
     if (allProjects || !item.project || item.project === 'shared') return true;
-    activeId ??= projectIdentity(project);
+    activeId ??= canonicalIdentity(projectIdentity(project));
     const key = String(item.project);
-    if (!identities.has(key)) identities.set(key, projectIdentity(key));
+    if (!identities.has(key)) identities.set(key, canonicalIdentity(projectIdentity(key)));
     return identities.get(key) === activeId;
   };
 }