memoir-cli 3.6.1 → 3.7.1

package/src/session/state.js

@@ -0,0 +1,296 @@
+// Session state: the canonical source of truth for "what are we working on"
+// across sessions and machines. Rendered into CLAUDE.md (and other tools) as a
+// pinned block at the top, guaranteed to load.
+//
+// File: ~/.config/memoir/session.json
+// See CLAUDE.md pinned block for how this gets displayed.
+
+import fs from 'fs-extra';
+import path from 'path';
+import os from 'os';
+import crypto from 'crypto';
+
+const home = os.homedir();
+const CONFIG_DIR = path.join(home, '.config', 'memoir');
+const SESSION_PATH = path.join(CONFIG_DIR, 'session.json');
+const MACHINE_ID_PATH = path.join(CONFIG_DIR, 'machine.id');
+
+export const SCHEMA_VERSION = 1;
+
+// Maximum items kept in each list before oldest entries rotate into history.
+// Prevents unbounded growth of the live pinned block.
+const MAX_GOALS = 3;
+const MAX_NEXT = 8;
+const MAX_QUESTIONS = 5;
+const MAX_DECISIONS_RECENT = 10;
+const MAX_HISTORY = 30;
+
+// ── Machine identity ─────────────────────────────────────────────
+
+// Stable per-machine identifier. Persisted once, reused forever.
+// We pair a UUID (stable across hostname changes) with a human label (hostname)
+// for display — "mac-mini (abc1234)".
+export async function getMachineId() {
+  try {
+    if (await fs.pathExists(MACHINE_ID_PATH)) {
+      const id = (await fs.readFile(MACHINE_ID_PATH, 'utf8')).trim();
+      if (id) return { id, label: os.hostname() };
+    }
+  } catch {}
+
+  const id = crypto.randomUUID();
+  await fs.ensureDir(CONFIG_DIR);
+  await fs.writeFile(MACHINE_ID_PATH, id);
+  return { id, label: os.hostname() };
+}
+
+// ── Schema ───────────────────────────────────────────────────────
+
+function emptySession() {
+  return {
+    version: SCHEMA_VERSION,
+    created_at: new Date().toISOString(),
+    updated_at: new Date().toISOString(),
+    machines: {}, // { [machineId]: { label, last_seen } }
+    current: {
+      goals: [],         // { text, machine_id, set_on }
+      next_actions: [],  // { text, machine_id, added, completed? }
+      open_questions: [],// { text, machine_id, asked }
+      decisions: [],     // { text, why?, rejected?, machine_id, date }
+    },
+    history: [],         // { date, machine_id, summary, files_touched, duration_min? }
+  };
+}
+
+// ── Read / write ─────────────────────────────────────────────────
+
+// Atomic read with graceful recovery from corrupted JSON.
+export async function readSession() {
+  if (!await fs.pathExists(SESSION_PATH)) return emptySession();
+
+  try {
+    const raw = await fs.readFile(SESSION_PATH, 'utf8');
+    const parsed = JSON.parse(raw);
+    return migrateIfNeeded(parsed);
+  } catch (err) {
+    // Corrupted — preserve it for inspection, start fresh.
+    const backup = `${SESSION_PATH}.corrupted-${Date.now()}`;
+    try { await fs.copy(SESSION_PATH, backup); } catch {}
+    return emptySession();
+  }
+}
+
+// Atomic write: write to tmp, rename. Prevents torn writes on crash.
+export async function writeSession(state) {
+  await fs.ensureDir(CONFIG_DIR);
+  state.updated_at = new Date().toISOString();
+  const tmp = `${SESSION_PATH}.tmp-${process.pid}`;
+  await fs.writeFile(tmp, JSON.stringify(state, null, 2));
+  await fs.move(tmp, SESSION_PATH, { overwrite: true });
+}
+
+function migrateIfNeeded(state) {
+  if (state && state.version === SCHEMA_VERSION) return state;
+  // Future versions: add migration steps here.
+  // For now, if version mismatch, merge defaults to fill gaps.
+  const fresh = emptySession();
+  return {
+    ...fresh,
+    ...state,
+    version: SCHEMA_VERSION,
+    current: { ...fresh.current, ...(state?.current || {}) },
+    machines: { ...fresh.machines, ...(state?.machines || {}) },
+    history: Array.isArray(state?.history) ? state.history : [],
+  };
+}
+
+// ── Machine registration ────────────────────────────────────────
+
+async function touchMachine(state) {
+  const { id, label } = await getMachineId();
+  state.machines[id] = {
+    label,
+    last_seen: new Date().toISOString(),
+  };
+  return id;
+}
+
+// ── Mutators ────────────────────────────────────────────────────
+
+export async function addGoal(text) {
+  const state = await readSession();
+  const machineId = await touchMachine(state);
+  state.current.goals.unshift({
+    text,
+    machine_id: machineId,
+    set_on: new Date().toISOString(),
+  });
+  state.current.goals = state.current.goals.slice(0, MAX_GOALS);
+  await writeSession(state);
+  return state;
+}
+
+export async function addNext(text) {
+  const state = await readSession();
+  const machineId = await touchMachine(state);
+  // Dedupe by text (case-insensitive)
+  const normalized = text.trim().toLowerCase();
+  const exists = state.current.next_actions.some(a => a.text.trim().toLowerCase() === normalized);
+  if (!exists) {
+    state.current.next_actions.push({
+      text,
+      machine_id: machineId,
+      added: new Date().toISOString(),
+    });
+    state.current.next_actions = state.current.next_actions.slice(-MAX_NEXT);
+  }
+  await writeSession(state);
+  return state;
+}
+
+export async function completeNext(textOrIndex) {
+  const state = await readSession();
+  await touchMachine(state);
+  let idx = -1;
+  if (typeof textOrIndex === 'number') {
+    idx = textOrIndex;
+  } else {
+    const normalized = String(textOrIndex).trim().toLowerCase();
+    idx = state.current.next_actions.findIndex(a => a.text.trim().toLowerCase().includes(normalized));
+  }
+  if (idx >= 0) {
+    state.current.next_actions.splice(idx, 1);
+  }
+  await writeSession(state);
+  return state;
+}
+
+export async function addNote(text, opts = {}) {
+  const state = await readSession();
+  const machineId = await touchMachine(state);
+  const decision = {
+    text,
+    machine_id: machineId,
+    date: new Date().toISOString(),
+  };
+  if (opts.why) decision.why = opts.why;
+  if (opts.rejected) decision.rejected = opts.rejected;
+  state.current.decisions.unshift(decision);
+  state.current.decisions = state.current.decisions.slice(0, MAX_DECISIONS_RECENT);
+  await writeSession(state);
+  return state;
+}
+
+export async function addQuestion(text) {
+  const state = await readSession();
+  const machineId = await touchMachine(state);
+  state.current.open_questions.push({
+    text,
+    machine_id: machineId,
+    asked: new Date().toISOString(),
+  });
+  state.current.open_questions = state.current.open_questions.slice(-MAX_QUESTIONS);
+  await writeSession(state);
+  return state;
+}
+
+// Roll up the current state into a history entry. Use at session end / push.
+// Does not clear `current` — these are "the working set," not per-session scratch.
+export async function recordSessionEnd({ summary, filesTouched = [], durationMin = null } = {}) {
+  const state = await readSession();
+  const machineId = await touchMachine(state);
+  state.history.unshift({
+    date: new Date().toISOString(),
+    machine_id: machineId,
+    summary: summary || '',
+    files_touched: filesTouched.slice(0, 20),
+    duration_min: durationMin,
+  });
+  state.history = state.history.slice(0, MAX_HISTORY);
+  await writeSession(state);
+  return state;
+}
+
+// ── Cross-machine merge ─────────────────────────────────────────
+
+// Merge a remote session (from another machine's backup) into local.
+// Never clobbers — unions lists, dedupes by text, keeps newest timestamp.
+// Machine entries accumulate so we can show "last seen on X".
+export function mergeSessions(local, remote) {
+  if (!remote) return local;
+  if (!local) local = { ...remote };
+
+  const merged = {
+    version: SCHEMA_VERSION,
+    created_at: earliest(local.created_at, remote.created_at),
+    updated_at: latest(local.updated_at, remote.updated_at),
+    machines: { ...remote.machines, ...local.machines }, // local wins for same machine
+    current: {
+      goals: unionByText(local.current?.goals, remote.current?.goals, 'set_on', MAX_GOALS),
+      next_actions: unionByText(local.current?.next_actions, remote.current?.next_actions, 'added', MAX_NEXT),
+      open_questions: unionByText(local.current?.open_questions, remote.current?.open_questions, 'asked', MAX_QUESTIONS),
+      decisions: unionByText(local.current?.decisions, remote.current?.decisions, 'date', MAX_DECISIONS_RECENT),
+    },
+    history: mergeHistory(local.history, remote.history),
+  };
+
+  // machines: union last_seen per id (take the newer)
+  for (const [id, entry] of Object.entries(remote.machines || {})) {
+    const existing = merged.machines[id];
+    if (!existing || new Date(entry.last_seen) > new Date(existing.last_seen)) {
+      merged.machines[id] = entry;
+    }
+  }
+
+  return merged;
+}
+
+function unionByText(a = [], b = [], dateField, cap) {
+  const byText = new Map();
+  for (const item of [...a, ...b]) {
+    if (!item || !item.text) continue;
+    const key = item.text.trim().toLowerCase();
+    const existing = byText.get(key);
+    if (!existing || new Date(item[dateField] || 0) > new Date(existing[dateField] || 0)) {
+      byText.set(key, item);
+    }
+  }
+  return Array.from(byText.values())
+    .sort((x, y) => new Date(y[dateField] || 0) - new Date(x[dateField] || 0))
+    .slice(0, cap);
+}
+
+function mergeHistory(a = [], b = []) {
+  const seen = new Set();
+  const all = [...a, ...b].filter(h => h && h.date);
+  // Dedupe by (date + machine_id + summary) — the three keys that make a session unique
+  const unique = all.filter(h => {
+    const key = `${h.date}|${h.machine_id}|${(h.summary || '').slice(0, 50)}`;
+    if (seen.has(key)) return false;
+    seen.add(key);
+    return true;
+  });
+  return unique
+    .sort((x, y) => new Date(y.date) - new Date(x.date))
+    .slice(0, MAX_HISTORY);
+}
+
+function earliest(a, b) {
+  if (!a) return b;
+  if (!b) return a;
+  return new Date(a) < new Date(b) ? a : b;
+}
+
+function latest(a, b) {
+  if (!a) return b;
+  if (!b) return a;
+  return new Date(a) > new Date(b) ? a : b;
+}
+
+// ── Paths (exported for tests + other modules) ──────────────────
+
+export const paths = {
+  config: CONFIG_DIR,
+  session: SESSION_PATH,
+  machineId: MACHINE_ID_PATH,
+};

package/.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,26 +0,0 @@
----
-name: Bug report
-about: Something isn't working
-title: ''
-labels: bug
-assignees: ''
----
-
-**What happened?**
-A clear description of the bug.
-
-**Steps to reproduce**
-1. Run `memoir ...`
-2. See error
-
-**Expected behavior**
-What you expected to happen.
-
-**Environment**
-- OS: [e.g. macOS 15, Windows 11, Ubuntu 24]
-- Node: [e.g. 20.11.0]
-- memoir version: [e.g. 3.2.2]
-- AI tools: [e.g. Claude Code, Cursor]
-
-**Logs / screenshots**
-Paste any error output here.

package/.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,16 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for memoir
-title: ''
-labels: enhancement
-assignees: ''
----
-
-**What would you like?**
-A clear description of the feature.
-
-**Why?**
-What problem does this solve for you?
-
-**Alternatives considered**
-Any workarounds you've tried.

package/CONTRIBUTING.md

@@ -1,47 +0,0 @@
-# Contributing to memoir
-
-Thanks for your interest in contributing! memoir is open source and welcomes contributions.
-
-## Quick start
-
-```bash
-git clone https://github.com/camgitt/memoir.git
-cd memoir
-npm install
-node bin/memoir.js status
-```
-
-## What to work on
-
-- **New tool adapters** — add support for more AI tools in `src/tools/`
-- **MCP improvements** — enhance the MCP server in `src/mcp.js`
-- **Bug fixes** — check [open issues](https://github.com/camgitt/memoir/issues)
-- **Documentation** — improve README, add examples
-
-## Submitting changes
-
-1. Fork the repo
-2. Create a branch (`git checkout -b feature/my-feature`)
-3. Make your changes
-4. Test locally: `npm test`
-5. Commit and push
-6. Open a PR with a clear description
-
-## Code style
-
-- ES modules (`import`/`export`)
-- No TypeScript (plain JS)
-- Keep dependencies minimal
-
-## Adding a tool adapter
-
-See `src/tools/claude.js` for an example. Each adapter exports:
-- `name` — display name
-- `icon` — emoji
-- `source` — path to the tool's config directory
-- `files` — specific files to sync (if `customExtract` is true)
-- `filter` — function to include/exclude files
-
-## Questions?
-
-Open an issue or start a discussion.

package/demo.svg

@@ -1,201 +0,0 @@
-<svg viewBox="0 0 700 1260" xmlns="http://www.w3.org/2000/svg" width="700" preserveAspectRatio="xMidYMid meet">
-  <defs>
-    <style>
-      @keyframes fadeIn {
-        0% { opacity: 0; }
-        5% { opacity: 1; }
-        100% { opacity: 1; }
-      }
-
-      @keyframes blink {
-        0%, 49%, 100% { opacity: 1; }
-        50%, 99% { opacity: 0; }
-      }
-
-      .terminal-bg { fill: #1e1e2e; }
-
-      .chrome-bar { fill: #2d2d44; }
-      .chrome-dot-red { fill: #ff5f56; }
-      .chrome-dot-yellow { fill: #ffbd2e; }
-      .chrome-dot-green { fill: #27c93f; }
-
-      .title { font-size: 24px; font-weight: bold; fill: #22d3ee; font-family: 'JetBrains Mono', monospace; }
-      .subtitle { font-size: 14px; fill: #71717a; font-family: 'JetBrains Mono', monospace; }
-      .command { font-size: 16px; fill: #e4e4e7; font-family: 'JetBrains Mono', monospace; }
-      .prompt { font-size: 16px; fill: #7c6ef0; font-family: 'JetBrains Mono', monospace; font-weight: bold; }
-      .success { font-size: 16px; fill: #4ade80; font-family: 'JetBrains Mono', monospace; }
-      .comment { font-size: 14px; fill: #eab308; font-family: 'JetBrains Mono', monospace; }
-      .dim { font-size: 14px; fill: #71717a; font-family: 'JetBrains Mono', monospace; }
-      .error { font-size: 16px; fill: #ef4444; font-family: 'JetBrains Mono', monospace; }
-
-      .line-1 { animation: fadeIn 0.3s ease-out 0.0s both; }
-      .line-2 { animation: fadeIn 0.3s ease-out 0.3s both; }
-      .line-3 { animation: fadeIn 0.3s ease-out 0.6s both; }
-      .line-4 { animation: fadeIn 0.3s ease-out 0.9s both; }
-      .line-5 { animation: fadeIn 0.3s ease-out 1.2s both; }
-      .line-6 { animation: fadeIn 0.3s ease-out 1.5s both; }
-      .line-7 { animation: fadeIn 0.3s ease-out 1.8s both; }
-      .line-8 { animation: fadeIn 0.3s ease-out 2.1s both; }
-      .line-9 { animation: fadeIn 0.3s ease-out 2.4s both; }
-      .line-10 { animation: fadeIn 0.3s ease-out 2.7s both; }
-      .line-11 { animation: fadeIn 0.3s ease-out 3.0s both; }
-      .line-12 { animation: fadeIn 0.3s ease-out 3.3s both; }
-      .line-13 { animation: fadeIn 0.3s ease-out 3.6s both; }
-      .line-14 { animation: fadeIn 0.3s ease-out 3.9s both; }
-      .line-15 { animation: fadeIn 0.3s ease-out 4.2s both; }
-      .line-16 { animation: fadeIn 0.3s ease-out 4.5s both; }
-      .line-17 { animation: fadeIn 0.3s ease-out 4.8s both; }
-      .line-18 { animation: fadeIn 0.3s ease-out 5.1s both; }
-      .line-19 { animation: fadeIn 0.3s ease-out 5.4s both; }
-      .line-20 { animation: fadeIn 0.3s ease-out 5.7s both; }
-      .line-21 { animation: fadeIn 0.3s ease-out 6.0s both; }
-      .line-22 { animation: fadeIn 0.3s ease-out 6.3s both; }
-      .line-23 { animation: fadeIn 0.3s ease-out 6.6s both; }
-      .line-24 { animation: fadeIn 0.3s ease-out 6.9s both; }
-      .line-25 { animation: fadeIn 0.3s ease-out 7.2s both; }
-      .line-26 { animation: fadeIn 0.3s ease-out 7.5s both; }
-      .line-27 { animation: fadeIn 0.3s ease-out 7.8s both; }
-      .line-28 { animation: fadeIn 0.3s ease-out 8.1s both; }
-      .line-29 { animation: fadeIn 0.3s ease-out 8.4s both; }
-      .line-30 { animation: fadeIn 0.3s ease-out 8.7s both; }
-      .line-31 { animation: fadeIn 0.3s ease-out 9.0s both; }
-      .line-32 { animation: fadeIn 0.3s ease-out 9.3s both; }
-      .line-33 { animation: fadeIn 0.3s ease-out 9.6s both; }
-      .line-34 { animation: fadeIn 0.3s ease-out 9.9s both; }
-      .line-35 { animation: fadeIn 0.3s ease-out 10.2s both; }
-      .line-36 { animation: fadeIn 0.3s ease-out 10.5s both; }
-      .line-37 { animation: fadeIn 0.3s ease-out 10.8s both; }
-      .line-38 { animation: fadeIn 0.3s ease-out 11.1s both; }
-      .line-39 { animation: fadeIn 0.3s ease-out 11.4s both; }
-      .line-40 { animation: fadeIn 0.3s ease-out 11.7s both; }
-      .line-41 { animation: fadeIn 0.3s ease-out 12.0s both; }
-      .line-42 { animation: fadeIn 0.3s ease-out 12.3s both; }
-      .line-43 { animation: fadeIn 0.3s ease-out 12.6s both; }
-      .line-44 { animation: fadeIn 0.3s ease-out 12.9s both; }
-
-      .cursor { animation: blink 0.8s infinite 13.5s; }
-    </style>
-  </defs>
-
-  <!-- Background -->
-  <rect class="terminal-bg" width="700" height="1260" rx="12" ry="12"/>
-
-  <!-- Chrome bar -->
-  <rect class="chrome-bar" width="700" height="30"/>
-  <circle class="chrome-dot-red" cx="20" cy="15" r="6"/>
-  <circle class="chrome-dot-yellow" cx="50" cy="15" r="6"/>
-  <circle class="chrome-dot-green" cx="80" cy="15" r="6"/>
-
-  <!-- Content -->
-  <g class="line-1">
-    <text class="title" x="20" y="80">memoir</text>
-    <text class="subtitle" x="180" y="80">— Your AI remembers everything.</text>
-  </g>
-
-  <text class="command line-2" x="20" y="120">npm install -g memoir-cli</text>
-
-  <text class="comment line-3" x="20" y="170"># See what AI tools are on this machine</text>
-
-  <g class="line-4">
-    <text class="prompt" x="20" y="210">❯ </text>
-    <text class="command" x="50" y="210">memoir status</text>
-  </g>
-
-  <text class="subtitle line-5" x="20" y="260">memoir v3.2.0</text>
-
-  <text class="subtitle line-6" x="20" y="300">Detected AI tools:</text>
-
-  <g class="line-7">
-    <text class="success" x="20" y="340">✔ </text>
-    <text class="command" x="50" y="340">Claude Code    ~/.claude/ (settings, memory, CLAUDE.md)</text>
-  </g>
-
-  <g class="line-8">
-    <text class="success" x="20" y="375">✔ </text>
-    <text class="command" x="50" y="375">Gemini CLI     ~/.gemini/ (config, GEMINI.md)</text>
-  </g>
-
-  <g class="line-9">
-    <text class="success" x="20" y="410">✔ </text>
-    <text class="command" x="50" y="410">Cursor         .cursorrules (settings, keybindings)</text>
-  </g>
-
-  <g class="line-10">
-    <text class="success" x="20" y="445">✔ </text>
-    <text class="command" x="50" y="445">Codex          ~/.codex/ (config, AGENTS.md)</text>
-  </g>
-
-  <g class="line-11">
-    <text class="success" x="20" y="480">✔ </text>
-    <text class="command" x="50" y="480">Aider          ~/.aider.conf.yml</text>
-  </g>
-
-  <text class="subtitle line-12" x="20" y="520">5 tools found on this machine.</text>
-
-  <text class="comment line-13" x="20" y="570"># Back up everything in one command</text>
-
-  <g class="line-14">
-    <text class="prompt" x="20" y="610">❯ </text>
-    <text class="command" x="50" y="610">memoir push</text>
-  </g>
-
-  <g class="line-15">
-    <text class="success" x="20" y="655">✔ </text>
-    <text class="command" x="50" y="655">AI memory backed up (5 tools, 23 files)</text>
-  </g>
-
-  <g class="line-16">
-    <text class="success" x="20" y="690">✔ </text>
-    <text class="command" x="50" y="690">Session context captured</text>
-  </g>
-
-  <g class="line-17">
-    <text class="success" x="20" y="725">✔ </text>
-    <text class="command" x="50" y="725">Workspace: 44 projects (17 git, 23 bundled)</text>
-  </g>
-
-  <g class="line-18">
-    <text class="dim" x="20" y="765">🔒 E2E encrypted · pushed in 3.2s</text>
-  </g>
-
-  <text class="comment line-19" x="20" y="815"># Simulate switching machines...</text>
-
-  <g class="line-20">
-    <text class="error" x="20" y="855">[wiped all AI configs]</text>
-  </g>
-
-  <text class="comment line-21" x="20" y="905"># Restore on the new machine</text>
-
-  <g class="line-22">
-    <text class="prompt" x="20" y="945">❯ </text>
-    <text class="command" x="50" y="945">memoir restore --yes</text>
-  </g>
-
-  <g class="line-23">
-    <text class="success" x="20" y="990">✔ </text>
-    <text class="command" x="50" y="990">AI memory restored (Claude, Gemini, Cursor, Codex, Aider)</text>
-  </g>
-
-  <g class="line-24">
-    <text class="success" x="20" y="1025">✔ </text>
-    <text class="command" x="50" y="1025">44 projects cloned &amp; unpacked</text>
-  </g>
-
-  <g class="line-25">
-    <text class="success" x="20" y="1060">✔ </text>
-    <text class="command" x="50" y="1060">Uncommitted changes applied</text>
-  </g>
-
-  <g class="line-26">
-    <text class="success" x="20" y="1095">✔ </text>
-    <text class="command" x="50" y="1095">Session context injected — AI picks up mid-conversation</text>
-  </g>
-
-  <text class="subtitle line-27" x="20" y="1140">Done. All AI memory restored in seconds.</text>
-
-  <text class="command line-28" x="20" y="1180">npm install -g memoir-cli</text>
-
-  <!-- Blinking cursor -->
-  <text class="command cursor" x="20" y="1220">_</text>
-
-</svg>

package/server.json

@@ -1,20 +0,0 @@
-{
-  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-12-11/server.schema.json",
-  "name": "io.github.camgitt/memoir",
-  "description": "Persistent memory for AI coding tools via MCP. Remembers across sessions and machines.",
-  "repository": {
-    "url": "https://github.com/camgitt/memoir",
-    "source": "github"
-  },
-  "version": "3.2.2",
-  "packages": [
-    {
-      "registryType": "npm",
-      "identifier": "memoir-cli",
-      "version": "3.2.2",
-      "transport": {
-        "type": "stdio"
-      }
-    }
-  ]
-}