hmem-mcp 7.4.0 → 8.0.0

package/dist/cli-checkpoint-agent.js

@@ -0,0 +1,320 @@
+/**
+ * cli-checkpoint-agent.ts
+ *
+ * Provider-agnostic agentic loop for the checkpoint agent.
+ * Replaces the `claude -p --model haiku` subprocess spawn.
+ *
+ * Supports: Anthropic (native), OpenAI-compatible (OpenAI, DeepSeek, Groq, etc.)
+ */
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { execFileSync, execSync } from "node:child_process";
+import Anthropic from "@anthropic-ai/sdk";
+import OpenAI from "openai";
+// ── Tool schemas (shared between providers) ──────────────────────────────────
+const TOOL_SCHEMAS = {
+    read_memory: {
+        type: "object",
+        properties: {
+            id: { type: "string", description: "Node ID, e.g. 'P0048' or 'O0048.3'" },
+            search: { type: "string", description: "Full-text search query" },
+            prefix: { type: "string", description: "Filter by category prefix (L, P, D, E, ...)" },
+        },
+    },
+    write_memory: {
+        type: "object",
+        properties: {
+            prefix: { type: "string", description: "Entry prefix: L, D, E, R, C" },
+            content: { type: "string", description: "Title + optional body (tab-indented children)" },
+            tags: { type: "array", items: { type: "string" }, description: "Hashtags, e.g. ['#hmem', '#bug']" },
+            links: { type: "array", items: { type: "string" }, description: "Linked entry IDs" },
+        },
+        required: ["prefix", "content"],
+    },
+    update_memory: {
+        type: "object",
+        properties: {
+            id: { type: "string", description: "Node ID to update" },
+            content: { type: "string", description: "New content (replaces existing)" },
+            tags: { type: "array", items: { type: "string" } },
+            irrelevant: { type: "boolean" },
+            favorite: { type: "boolean" },
+        },
+        required: ["id"],
+    },
+    append_memory: {
+        type: "object",
+        properties: {
+            id: { type: "string", description: "Parent node ID" },
+            content: { type: "string", description: "Child content (tab-indented for nesting)" },
+        },
+        required: ["id", "content"],
+    },
+    move_nodes: {
+        type: "object",
+        properties: {
+            node_ids: { type: "array", items: { type: "string" }, description: "Exchange node IDs to move" },
+            target_o_id: { type: "string", description: "Target O-entry ID, e.g. 'O0042'" },
+        },
+        required: ["node_ids", "target_o_id"],
+    },
+    list_projects: {
+        type: "object",
+        properties: {},
+    },
+};
+// ── Tool executor ─────────────────────────────────────────────────────────────
+function executeTool(name, input, store) {
+    try {
+        switch (name) {
+            case "read_memory": {
+                const { id, search, prefix } = input;
+                const entries = store.read({ id, search, prefix, depth: 3 });
+                if (!entries.length)
+                    return "No results found.";
+                return entries.slice(0, 20).map(e => `${e.id}  ${e.level_1 ?? ""}${e.level_2 ? "\n  " + e.level_2 : ""}`).join("\n");
+            }
+            case "write_memory": {
+                const { prefix, content, tags, links } = input;
+                const result = store.write(prefix, content, links, undefined, undefined, tags);
+                return `Created: ${result.id}`;
+            }
+            case "update_memory": {
+                const { id, content, tags, irrelevant, favorite } = input;
+                const ok = store.updateNode(id, content, undefined, undefined, favorite, undefined, irrelevant, tags);
+                return ok ? `Updated: ${id}` : `Not found: ${id}`;
+            }
+            case "append_memory": {
+                const { id, content } = input;
+                const result = store.appendChildren(id, content);
+                return `Appended ${result.count} node(s): ${result.ids.join(", ")}`;
+            }
+            case "move_nodes": {
+                const { node_ids, target_o_id } = input;
+                const result = store.moveNodes(node_ids, target_o_id);
+                return `Moved ${result.moved}. Errors: ${result.errors.join(", ") || "none"}`;
+            }
+            case "list_projects": {
+                const projects = store.listProjects();
+                return projects.map(p => `  ${p.id}  ${p.title}`).join("\n");
+            }
+            default:
+                return `Unknown tool: ${name}`;
+        }
+    }
+    catch (e) {
+        return `Error: ${e?.message ?? String(e)}`;
+    }
+}
+// ── Anthropic loop ────────────────────────────────────────────────────────────
+async function runAnthropicLoop(prompt, store, config) {
+    const apiKeyEnv = config.checkpointApiKeyEnv ?? "ANTHROPIC_API_KEY";
+    const apiKey = process.env[apiKeyEnv];
+    if (!apiKey)
+        throw new Error(`Missing env var: ${apiKeyEnv}`);
+    const client = new Anthropic({ apiKey });
+    const tools = Object.entries(TOOL_SCHEMAS).map(([name, schema]) => ({
+        name,
+        description: `hmem ${name}`,
+        input_schema: schema,
+    }));
+    const messages = [{ role: "user", content: prompt }];
+    for (let i = 0; i < 40; i++) {
+        const response = await client.messages.create({
+            model: config.checkpointModel,
+            max_tokens: 4096,
+            tools,
+            messages,
+        });
+        messages.push({ role: "assistant", content: response.content });
+        if (response.stop_reason === "end_turn")
+            break;
+        const toolUses = response.content.filter((b) => b.type === "tool_use");
+        if (!toolUses.length)
+            break;
+        const results = toolUses.map(block => ({
+            type: "tool_result",
+            tool_use_id: block.id,
+            content: executeTool(block.name, block.input, store),
+        }));
+        messages.push({ role: "user", content: results });
+    }
+}
+// ── OpenAI-compatible loop ────────────────────────────────────────────────────
+async function runOpenAILoop(prompt, store, config) {
+    const apiKeyEnv = config.checkpointApiKeyEnv ?? "OPENAI_API_KEY";
+    const apiKey = process.env[apiKeyEnv];
+    if (!apiKey)
+        throw new Error(`Missing env var: ${apiKeyEnv}`);
+    const client = new OpenAI({
+        apiKey,
+        ...(config.checkpointBaseUrl ? { baseURL: config.checkpointBaseUrl } : {}),
+    });
+    const tools = Object.entries(TOOL_SCHEMAS).map(([name, schema]) => ({
+        type: "function",
+        function: { name, description: `hmem ${name}`, parameters: schema },
+    }));
+    const messages = [{ role: "user", content: prompt }];
+    for (let i = 0; i < 40; i++) {
+        const response = await client.chat.completions.create({
+            model: config.checkpointModel,
+            tools,
+            messages,
+        });
+        const choice = response.choices[0];
+        if (!choice)
+            break;
+        messages.push(choice.message);
+        if (choice.finish_reason === "stop" || !choice.message.tool_calls?.length)
+            break;
+        for (const call of choice.message.tool_calls) {
+            if (!("function" in call))
+                continue;
+            let input = {};
+            try {
+                input = JSON.parse(call.function.arguments);
+            }
+            catch { }
+            const result = executeTool(call.function.name, input, store);
+            messages.push({ role: "tool", tool_call_id: call.id, content: result });
+        }
+    }
+}
+// ── claude -p subprocess fallback (for Max/OAuth users without API key) ────────
+function buildMcpConfig(projectDir, hmemPath) {
+    let hmemServerPath;
+    try {
+        hmemServerPath = execSync("which hmem", { encoding: "utf8" }).trim();
+        const realPath = fs.realpathSync(hmemServerPath);
+        hmemServerPath = path.join(path.dirname(realPath), "mcp-server.js");
+        if (!fs.existsSync(hmemServerPath)) {
+            hmemServerPath = path.join(path.dirname(path.dirname(realPath)), "dist", "mcp-server.js");
+        }
+    }
+    catch {
+        hmemServerPath = path.join(process.env.HOME || "/home", ".nvm/versions/node", process.version, "lib/node_modules/hmem-mcp/dist/mcp-server.js");
+    }
+    const mcpConfig = {
+        mcpServers: {
+            hmem: {
+                command: process.execPath,
+                args: [hmemServerPath],
+                env: { HMEM_PROJECT_DIR: projectDir, HMEM_PATH: hmemPath, HMEM_NO_SESSION: "1" },
+            },
+        },
+    };
+    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "hmem-checkpoint-"));
+    fs.chmodSync(tmpDir, 0o700);
+    const tmpPath = path.join(tmpDir, "mcp-config.json");
+    fs.writeFileSync(tmpPath, JSON.stringify(mcpConfig), "utf8");
+    return tmpPath;
+}
+async function runClaudeSubprocess(prompt, hmemPath, model) {
+    const projectDir = path.dirname(hmemPath);
+    const mcpConfigPath = buildMcpConfig(projectDir, hmemPath);
+    try {
+        execFileSync("claude", [
+            "-p", "--model", model,
+            "--mcp-config", mcpConfigPath,
+            "--allowedTools", "mcp__hmem__update_memory mcp__hmem__write_memory mcp__hmem__append_memory mcp__hmem__read_memory mcp__hmem__move_nodes mcp__hmem__list_projects",
+            "--dangerously-skip-permissions",
+        ], { input: prompt, encoding: "utf8", timeout: 120_000 });
+    }
+    finally {
+        try {
+            fs.unlinkSync(mcpConfigPath);
+        }
+        catch { }
+        try {
+            fs.rmdirSync(path.dirname(mcpConfigPath));
+        }
+        catch { }
+    }
+}
+function hasClaudeBinary() {
+    try {
+        execSync("which claude", { stdio: "ignore" });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Detect which AI harness invoked us. Honors explicit HMEM_HARNESS override first
+ * (plugins/extensions should set this when they spawn `hmem checkpoint`); falls
+ * back to env-var signatures the harnesses set themselves.
+ */
+export function detectHarness() {
+    const explicit = process.env.HMEM_HARNESS?.toLowerCase();
+    if (explicit === "claude-code" || explicit === "codex" || explicit === "opencode" ||
+        explicit === "pi" || explicit === "hermes") {
+        return explicit;
+    }
+    if (process.env.CLAUDECODE || process.env.CLAUDE_CODE_SESSION_ID)
+        return "claude-code";
+    if (process.env.CODEX_SESSION_ID || process.env.CODEX_API_KEY)
+        return "codex";
+    return "unknown";
+}
+// ── Public entry point ────────────────────────────────────────────────────────
+/**
+ * Harness-aware provider routing:
+ *   - Claude Code → Haiku via `claude -p` subprocess (uses Max OAuth, no API key)
+ *   - Codex      → gpt-5.4-mini via OpenAI API (uses OPENAI_API_KEY)
+ *   - OpenCode / Pi / Hermes / unknown → user's configured provider (hmem.config.json)
+ *
+ * The harness routing takes precedence over the configured provider — Claude Code
+ * users explicitly want Haiku-via-OAuth (covered by Max), not their DeepSeek key.
+ */
+export async function runCheckpointAgent(prompt, store, config, hmemPath) {
+    const harness = detectHarness();
+    console.error(`[hmem checkpoint] harness=${harness} hmemPath=${hmemPath ? "set" : "unset"} claudeBin=${hasClaudeBinary()}`);
+    // 1. Claude Code → Haiku via `claude -p` (Max OAuth, no API key needed)
+    if (harness === "claude-code" && hmemPath && hasClaudeBinary()) {
+        console.error(`[hmem checkpoint] → routing to claude -p (Haiku via Max OAuth)`);
+        store.close();
+        await runClaudeSubprocess(prompt, hmemPath, "claude-haiku-4-5-20251001");
+        return;
+    }
+    // 2. Codex → gpt-5.4-mini via OpenAI API
+    if (harness === "codex") {
+        const codexConfig = {
+            ...config,
+            checkpointProvider: "openai",
+            checkpointModel: "gpt-5.4-mini",
+            checkpointApiKeyEnv: "OPENAI_API_KEY",
+            checkpointBaseUrl: undefined,
+        };
+        await runOpenAILoop(prompt, store, codexConfig);
+        return;
+    }
+    // 3. OpenCode / Pi / Hermes / unknown → user's configured provider
+    const apiKeyEnv = config.checkpointApiKeyEnv
+        ?? (config.checkpointProvider === "openai" ? "OPENAI_API_KEY" : "ANTHROPIC_API_KEY");
+    const apiKey = process.env[apiKeyEnv];
+    if (apiKey) {
+        console.error(`[hmem checkpoint] → routing to ${config.checkpointProvider} API (${config.checkpointModel})`);
+        if (config.checkpointProvider === "openai") {
+            await runOpenAILoop(prompt, store, config);
+        }
+        else {
+            await runAnthropicLoop(prompt, store, config);
+        }
+        return;
+    }
+    // 4. Last-resort: claude -p subprocess if Claude binary is on PATH (zero-config Claude Max)
+    if (hmemPath && hasClaudeBinary()) {
+        store.close();
+        await runClaudeSubprocess(prompt, hmemPath, config.checkpointModel);
+        return;
+    }
+    throw new Error(`[hmem checkpoint] No checkpoint provider available for harness=${harness}.\n` +
+        "Configure one in hmem.config.json → memory:\n" +
+        '  "checkpointProvider": "anthropic"  (or "openai")\n' +
+        '  "checkpointModel": "claude-haiku-4-5-20251001"\n' +
+        '  "checkpointApiKeyEnv": "ANTHROPIC_API_KEY"  (env var name holding your key)\n' +
+        "Or install `claude` CLI for the Claude Max zero-config fallback.");
+}
+//# sourceMappingURL=cli-checkpoint-agent.js.map

package/dist/cli-checkpoint-agent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli-checkpoint-agent.js","sourceRoot":"","sources":["../src/cli-checkpoint-agent.ts"],"names":[],"mappings":"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"}

package/dist/cli-checkpoint.js

@@ -14,49 +14,48 @@
  *   HMEM_PROJECT_DIR — directory for config + company.hmem
  */
 import fs from "node:fs";
-import os from "node:os";
 import path from "node:path";
-import { execFileSync, execSync } from "node:child_process";
+import { spawn } from "node:child_process";
 import { HmemStore } from "./hmem-store.js";
 import { loadHmemConfig } from "./hmem-config.js";
 import { currentSessionId } from "./session-state.js";
-/** Build a minimal MCP config JSON for the subagent (hmem only). */
-function buildMcpConfig(projectDir, hmemPath) {
-    // Find the hmem-mcp entry point
-    let hmemServerPath;
+import { runCheckpointAgent } from "./cli-checkpoint-agent.js";
+function syncReady(hmemPath) {
+    if (!process.env.HMEM_SYNC_PASSPHRASE)
+        return false;
     try {
-        hmemServerPath = execSync("which hmem", { encoding: "utf8" }).trim();
-        // Resolve symlink to find the actual JS file
-        const realPath = fs.realpathSync(hmemServerPath);
-        hmemServerPath = path.join(path.dirname(realPath), "mcp-server.js");
-        if (!fs.existsSync(hmemServerPath)) {
-            // Fallback: look in the dist directory relative to the resolved path
-            hmemServerPath = path.join(path.dirname(path.dirname(realPath)), "dist", "mcp-server.js");
-        }
+        const cfgPath = path.join(path.dirname(hmemPath), "config.json");
+        if (!fs.existsSync(cfgPath))
+            return false;
+        const cfg = JSON.parse(fs.readFileSync(cfgPath, "utf8"));
+        if (!cfg.api_key || !cfg.active_file)
+            return false;
+        const fileCfg = cfg.files?.[cfg.active_file];
+        return !!(fileCfg?.salt && fileCfg?.hmem_path);
     }
     catch {
-        // Fallback: global npm path
-        hmemServerPath = path.join(process.env.HOME || "/home", ".nvm/versions/node", process.version, "lib/node_modules/hmem-mcp/dist/mcp-server.js");
+        return false;
     }
-    const nodePath = process.execPath;
-    const config = {
-        mcpServers: {
-            hmem: {
-                command: nodePath,
-                args: [hmemServerPath],
-                env: {
-                    HMEM_PROJECT_DIR: projectDir,
-                    HMEM_PATH: hmemPath,
-                    HMEM_NO_SESSION: "1",
-                },
-            },
-        },
-    };
-    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "hmem-checkpoint-"));
-    fs.chmodSync(tmpDir, 0o700);
-    const tmpPath = path.join(tmpDir, "mcp-config.json");
-    fs.writeFileSync(tmpPath, JSON.stringify(config), "utf8");
-    return tmpPath;
+}
+async function runSyncChild(args, label) {
+    await new Promise((resolve) => {
+        const child = spawn(process.execPath, [process.argv[1], "sync", ...args], {
+            env: { ...process.env },
+            stdio: ["ignore", "pipe", "pipe"],
+            windowsHide: true,
+        });
+        let stderr = "";
+        child.stderr?.on("data", (d) => { stderr += d.toString(); });
+        child.on("close", (code) => {
+            if (code !== 0)
+                console.error(`[hmem checkpoint] sync ${label} exited ${code}: ${stderr.trim()}`);
+            resolve();
+        });
+        child.on("error", (err) => {
+            console.error(`[hmem checkpoint] sync ${label} spawn failed: ${err.message}`);
+            resolve();
+        });
+    });
 }
 export async function checkpoint() {
     const projectDir = process.env.HMEM_PROJECT_DIR;
@@ -65,24 +64,119 @@ export async function checkpoint() {
     const hmemPath = process.env.HMEM_PATH;
     if (!fs.existsSync(hmemPath))
         process.exit(0);
+    const doSync = syncReady(hmemPath);
+    if (doSync)
+        await runSyncChild(["pull"], "pull");
     const config = loadHmemConfig(path.dirname(hmemPath));
     const store = new HmemStore(hmemPath, config);
-    let mcpConfigPath = "";
     try {
-        // 1. Get active project and its O-entry (prefer env from log-exchange, fallback to DB)
+        // 1. Get active project and its O-entry. Tries in order:
+        //    (a) HMEM_ACTIVE_PROJECT env (set by log-exchange when it knows the project)
+        //    (b) getActiveProject(currentSessionId) — session marker → DB active=1 flag
+        //    (c) getMostRecentlyActiveProject() — newest O-entry exchange (heuristic)
+        // The previous "silent return on null" hid genuine misrouted exchanges; loud
+        // logging + a heuristic fallback prevents the multi-device "session-marker stripped
+        // but exchanges still arrive" failure mode.
         const envProjectId = process.env.HMEM_ACTIVE_PROJECT;
-        const activeProject = envProjectId
+        let activeProject = envProjectId
             ? store.getProjectById(envProjectId)
             : store.getActiveProject(currentSessionId());
-        if (!activeProject)
+        if (!activeProject) {
+            const recent = store.getMostRecentlyActiveProject();
+            if (recent) {
+                activeProject = recent;
+                console.error(`[hmem checkpoint] No active-project marker — falling back to most recent O-entry activity: ${recent.id}`);
+            }
+        }
+        if (!activeProject) {
+            console.error("[hmem checkpoint] No active project found. Tried: " +
+                `env(HMEM_ACTIVE_PROJECT)=${envProjectId ?? "(unset)"}, ` +
+                `session-marker(sessionId=${currentSessionId() ?? "(none)"})=miss, ` +
+                "DB active=1 flag=miss, recent O-entry activity=none. " +
+                "Skipping checkpoint — exchanges will accumulate without summary until a project is activated.");
             return;
+        }
         const projectSeq = parseInt(activeProject.id.replace(/\D/g, ""), 10);
         const oId = store.resolveProjectO(projectSeq);
         // 2. Find the latest full batch (L3 with >= batchSize L4 children)
         const batchSize = config.checkpointInterval || 5;
         const latestFullBatch = store.getLatestFullBatch(oId, batchSize);
-        if (!latestFullBatch)
+        // Determine current session node to exclude from orphan search
+        const latestSession = store.getChildNodes(oId)
+            .filter(n => n.depth === 2)
+            .sort((a, b) => b.seq - a.seq)[0];
+        const currentSessionNodeId = latestFullBatch?.sessionId ?? latestSession?.id ?? null;
+        // Find orphaned batches from previous sessions that never got summarized.
+        // cap=5: catch up backlog without exceeding context budget (~5KB per batch after truncation).
+        const orphanedBatches = store.getOrphanedBatches(oId, currentSessionNodeId);
+        if (!latestFullBatch && orphanedBatches.length === 0)
             return;
+        // Build orphan section text once — used by both the orphan-only path
+        // (when no full batch) and the normal path (as Section 0b alongside the latest batch).
+        // Side effect: tags #skill-dialog on matching exchanges.
+        const orphanSections = orphanedBatches.map((ob, i) => {
+            const exs = store.getOEntryExchangesV2(oId, 20, { sessionScope: [ob.sessionId] });
+            const batchExs = exs.filter(ex => ex.nodeId.startsWith(ob.batchId + "."));
+            if (batchExs.length === 0)
+                return null;
+            const formatted = batchExs.map((ex, j) => {
+                let user = ex.userText.replace(/<channel[^>]*>\s*/g, "").replace(/<\/channel>\s*/g, "").trim();
+                let agent = (ex.agentText ?? "").replace(/<[^>]+>/g, "").trim();
+                user = user.length > 800 ? user.substring(0, 800) + "..." : user;
+                agent = agent.length > 1200 ? agent.substring(0, 1200) + "..." : agent;
+                return `--- Exchange ${j + 1} (${ex.nodeId}) ---\nUSER: ${user}\nAGENT: ${agent}`;
+            }).join("\n\n");
+            const listing = batchExs.map(ex => `  ${ex.nodeId}: "${ex.title}"`).join("\n");
+            for (const ex of batchExs) {
+                if (ex.userText.includes("Base directory for this skill:")) {
+                    store.addTag(ex.nodeId, "#skill-dialog");
+                }
+            }
+            return `=== Orphan Batch ${i + 1}: ${ob.batchId} | Session ${ob.sessionId} (${ob.sessionDate}) — "${ob.sessionTitle}" ===
+Current exchange titles:
+${listing}
+
+${formatted}`;
+        }).filter((s) => s !== null);
+        // Orphan-only path: no full batch but orphaned batches exist
+        if (!latestFullBatch) {
+            const pName = activeProject.title.split("|")[0].trim();
+            const pId = activeProject.id;
+            const pList = store.listProjects().map(p => `  ${p.id} ${p.title}`).join("\n");
+            if (orphanSections.length === 0)
+                return;
+            const orphanPrompt = `You are a checkpoint agent for "${pName}" (${pId}).
+Process ${orphanSections.length} orphaned batch(es) — prior sessions too short for a regular checkpoint.
+
+== All Projects ==
+${pList}
+
+${orphanSections.join("\n\n")}
+
+## Tasks for EACH batch above (Tasks 1, 2, 5, 6 only):
+
+### 1. Title each exchange
+For each: update_memory(id="<nodeId>", content="Descriptive title, max 50 chars, match conversation language")
+GOOD: "Fix: cleanTitle strips separators" | BAD: "Projekt laden" or "ok"
+
+### 2. Write rolling summary for each batch
+update_memory(id="<batchId>", content="Summary: 2-5 sentences covering this batch. Match conversation language.")
+
+### 5. Tag exchanges
+For each exchange, add ONE tag if applicable: #skill-dialog, #irrelevant, #planning, #debugging, #admin, #meta, #repetition
+
+### 6. Update each session title and summary
+update_memory(id="<sessionId>", content="Short session title, max 60 chars\\n> 2-5 sentences. Key decisions, outcomes. Written for someone picking up cold.")
+
+## Rules:
+- Match language of existing entries
+- Tags: lowercase with #
+- Do NOT extract L/E/D entries (skip Task 3)
+- Do NOT update P-entry (skip Task 4)`;
+            await runCheckpointAgent(orphanPrompt, store, config);
+            console.log(`[hmem checkpoint] Orphan batches processed: ${orphanSections.length} (${config.checkpointProvider}/${config.checkpointModel})`);
+            return;
+        }
         const batchId = latestFullBatch.id;
         const sessionId = latestFullBatch.sessionId;
         // 3. Get exchanges from this batch
@@ -126,10 +220,7 @@ export async function checkpoint() {
         const allProjects = store.listProjects();
         const projectName = activeProject.title.split("|")[0].trim();
         const projectId = activeProject.id;
-        // Close store before spawning subagent
-        store.close();
-        // 7. Build MCP config and prompt
-        mcpConfigPath = buildMcpConfig(projectDir, hmemPath);
+        // 7. Build prompt
         const formattedExchanges = batchExchanges.map((ex, i) => {
             // Strip XML channel tags from Telegram messages before passing to Haiku
             let user = ex.userText.replace(/<channel[^>]*>\s*/g, "").replace(/<\/channel>\s*/g, "").trim();
@@ -167,6 +258,16 @@ Call: update_memory(id="<id>", content="Short title\\n> 2-5 sentences. Skip if n
 
 ${catchupSessions.map(d => `Session ${d.id} (${d.date}) — "${d.title}":\n${d.body}`).join("\n\n")}
 
+`
+            : "";
+        // Section 0b: orphan batches from previous sessions that never got summarized.
+        // Applies Tasks 1, 2, 5 to each (title, batch summary, tag) — NOT P-entry updates or knowledge extraction.
+        const orphanCatchupSection = orphanSections.length > 0
+            ? `### 0b. Catch up unsummarized batches from past sessions
+${orphanSections.length} prior batch(es) were never summarized — likely because a newer full batch arrived first. Apply Tasks 1, 2, and 5 to EACH batch below (titles, rolling summary on the batch node, exchange tags). Do NOT extract L/E/D entries from orphans (Task 3) and do NOT update the P-entry (Task 4) from them.
+
+${orphanSections.join("\n\n")}
+
 `
             : "";
         const prompt = `You are a checkpoint agent for "${projectName}" (${projectId}).
@@ -181,7 +282,7 @@ ${prevSummaryText}
 == Batch Exchanges ==
 ${formattedExchanges}
 
-${catchupSection}## Tasks (execute ALL in order):
+${catchupSection}${orphanCatchupSection}## Tasks (execute ALL in order):
 
 ### 1. Title each exchange (REQUIRED)
 Current titles (auto-extracted):
@@ -256,50 +357,36 @@ Do ALL exchanges belong to ${projectName}?
 Check against the project list above. If an exchange belongs elsewhere, call:
 move_nodes(node_ids=["<exchange_id>"], target_o_id="O00XX")
 
+### 8. Update O-entry project state (${oId})
+1. read_memory(id="${oId}") — read the CURRENT body first
+2. Synthesize: keep what's still true, drop what's outdated, add what changed this session
+3. update_memory(id="${oId}", content="<fresh replacement, max 4 sentences>")
+
+The result must be a REPLACEMENT, not an addition. Cap at 4 sentences total regardless of how much is in the old body.
+Content: current project status, what just shipped/changed, top open item or next step.
+Written for someone picking up cold — concrete specifics, no jargon.
+Skip if this session was purely admin/infra with no meaningful project-level change.
+This body is injected verbatim into every load_project briefing.
+
 ## Rules:
 - read_memory() FIRST to see current state
 - Match language of existing entries
 - Tags: 3-5 per entry, lowercase with #
 - Only save what's valuable in 6 months`;
-        // 8. Spawn Haiku with MCP access
-        const allowedTools = [
-            "mcp__hmem__read_memory",
-            "mcp__hmem__write_memory",
-            "mcp__hmem__append_memory",
-            "mcp__hmem__update_memory",
-            "mcp__hmem__list_projects",
-            "mcp__hmem__move_nodes",
-        ].join(" ");
-        const disallowedTools = "mcp__hmem__flush_context";
-        try {
-            const output = execFileSync("claude", [
-                "-p", "--model", "haiku",
-                "--mcp-config", mcpConfigPath,
-                "--allowedTools", allowedTools,
-                "--disallowedTools", disallowedTools,
-                "--dangerously-skip-permissions",
-            ], { input: prompt, encoding: "utf8", timeout: 120_000 }).trim();
-            console.log(`[hmem checkpoint] Haiku: ${output.substring(0, 300)}`);
-        }
-        catch (e) {
-            const stdout = e.stdout?.toString()?.substring(0, 200) || "";
-            console.error(`[hmem checkpoint] Failed (exit ${e.status}): ${stdout}`);
-        }
+        // 8. Run checkpoint agent (actual provider chosen by runCheckpointAgent based on harness — see its diagnostic logs)
+        await runCheckpointAgent(prompt, store, config, hmemPath);
+        console.log(`[hmem checkpoint] Done (batch ${batchId}, ${batchExchanges.length} exchanges)`);
     }
     catch (e) {
         console.error(`[hmem checkpoint] ${e}`);
     }
     finally {
-        if (mcpConfigPath) {
-            try {
-                fs.unlinkSync(mcpConfigPath);
-            }
-            catch { }
-            try {
-                fs.rmdirSync(path.dirname(mcpConfigPath));
-            }
-            catch { }
+        try {
+            store.close();
         }
+        catch { }
+        if (doSync)
+            await runSyncChild(["push", "--skip-pull"], "push");
     }
 }
 //# sourceMappingURL=cli-checkpoint.js.map