hmem-mcp 7.4.0 → 8.0.0

package/dist/cli-migrate.js

@@ -0,0 +1,394 @@
+/**
+ * Script:    cli-migrate.ts
+ * Purpose:   User-facing `hmem migrate` — safely upgrade a v1 (.hmem) store to v2.
+ * Author:    DEVELOPER
+ * Created:   2026-05-27
+ *
+ * Safety contract (see docs/.../2026-05-26-v2-hmem-migrate-command-plan.md §2):
+ *   Until the single atomic rename in the swap step, LIVE is byte-for-byte the
+ *   original. A timestamped backup (live + -wal/-shm sidecars, copied verbatim)
+ *   is the safety net for the rename window and is ALWAYS kept.
+ *
+ * The migrator itself (./migrate/v1-to-v2.js) opens --in READ-ONLY and writes only
+ * --out, so it never mutates the live file. This module orchestrates classify →
+ * quiesce → confirm → backup → migrate-to-temp → validate → atomic-swap → verify.
+ */
+import { existsSync, copyFileSync, renameSync, readFileSync, rmSync, } from 'node:fs';
+import { resolve, dirname, join } from 'node:path';
+import { createInterface } from 'node:readline';
+import Database from 'better-sqlite3';
+import { migrate } from './migrate/v1-to-v2.js';
+import { resolveHmemPath } from './hmem-store.js';
+// ---------------------------------------------------------------------------
+// Read-only classification (NEVER openDb on a v1 file — that stamps it v2)
+// ---------------------------------------------------------------------------
+/**
+ * Classify a store path WITHOUT mutating it. Opens read-only and inspects
+ * sqlite_master + schema_version, mirroring openDb()'s precheck.
+ */
+export function classify(path) {
+    if (!existsSync(path))
+        return 'missing';
+    let db;
+    try {
+        db = new Database(path, { readonly: true });
+        const tables = db.prepare("SELECT name FROM sqlite_master WHERE type='table'").all().map(t => t.name);
+        const hasEntries = tables.includes('entries');
+        const hasMemories = tables.includes('memories');
+        if (hasEntries) {
+            const row = db.prepare("SELECT value FROM schema_version WHERE key='schema_major'").get();
+            return row?.value === '2' ? 'v2' : 'ambiguous';
+        }
+        if (hasMemories)
+            return 'v1';
+        return 'ambiguous';
+    }
+    catch {
+        return 'ambiguous';
+    }
+    finally {
+        try {
+            db?.close();
+        }
+        catch { /* ignore */ }
+    }
+}
+function sourceCounts(path) {
+    const db = new Database(path, { readonly: true });
+    try {
+        const m = db.prepare('SELECT COUNT(*) c FROM memories').get().c;
+        const n = db.prepare('SELECT COUNT(*) c FROM memory_nodes').get().c;
+        return { memories: m, memoryNodes: n };
+    }
+    finally {
+        db.close();
+    }
+}
+// ---------------------------------------------------------------------------
+// Default validator (§2 step 6)
+// ---------------------------------------------------------------------------
+const defaultValidator = (tmpPath, source) => {
+    const db = new Database(tmpPath, { readonly: true });
+    try {
+        const integrity = db.pragma('integrity_check', { simple: true });
+        if (integrity !== 'ok')
+            throw new Error(`integrity_check failed: ${integrity}`);
+        const tables = db.prepare("SELECT name FROM sqlite_master WHERE type='table'").all().map(t => t.name);
+        if (!tables.includes('entries'))
+            throw new Error('migrated store is missing the `entries` table');
+        if (tables.includes('memories'))
+            throw new Error('migrated store still has the v1 `memories` table');
+        const entries = db.prepare('SELECT COUNT(*) c FROM entries').get().c;
+        if (entries <= 0)
+            throw new Error('migrated store has 0 entries');
+        const major = db.prepare("SELECT value v FROM schema_version WHERE key='schema_major'").get()?.v;
+        if (major !== '2')
+            throw new Error(`migrated store schema_major=${major ?? 'null'} (expected 2)`);
+        const mig = db.prepare("SELECT value FROM schema_version WHERE key='v1_migration'").get();
+        if (!mig)
+            throw new Error('migrated store missing the v1_migration marker key');
+        // Count sanity: entries should not exceed the v1 root count (memories rows).
+        // The migrator's exact invariant (non-O/non-F roots) is asserted in
+        // test/migrate/acceptance.test.ts; here we guard against gross loss/explosion.
+        if (entries > source.memories) {
+            throw new Error(`entries (${entries}) exceed source roots (${source.memories}) — unexpected`);
+        }
+    }
+    finally {
+        db.close();
+    }
+};
+// ---------------------------------------------------------------------------
+// Real serve-lockfile probe (Layer 1, §3)
+// ---------------------------------------------------------------------------
+const SERVE_LOCK_NAME = '.hmem.serve.lock';
+function pidAlive(pid) {
+    if (!Number.isInteger(pid) || pid <= 0)
+        return false;
+    try {
+        process.kill(pid, 0); // signal 0 = existence check, doesn't actually signal
+        return true;
+    }
+    catch (e) {
+        // EPERM means the process exists but we can't signal it → still alive.
+        return e?.code === 'EPERM';
+    }
+}
+/** Default lock probe: read <dir>/.hmem.serve.lock and report PID liveness. */
+export const defaultLockProbe = (dir) => {
+    const lockPath = join(dir, SERVE_LOCK_NAME);
+    if (!existsSync(lockPath))
+        return null;
+    try {
+        const data = JSON.parse(readFileSync(lockPath, 'utf8'));
+        const pid = typeof data.pid === 'number' ? data.pid : -1;
+        return { pid, alive: pidAlive(pid) };
+    }
+    catch {
+        // Unparseable lockfile → treat as stale (don't block on garbage).
+        return { pid: -1, alive: false };
+    }
+};
+// ---------------------------------------------------------------------------
+// Core (testable): migratePlan
+// ---------------------------------------------------------------------------
+function utcStamp() {
+    return new Date().toISOString().replace(/[-:]/g, '').replace(/\.\d+Z$/, 'Z');
+}
+export async function migratePlan(opts) {
+    const log = opts.log ?? ((m) => console.log(m));
+    const validate = opts.validate ?? defaultValidator;
+    const probeLock = opts.probeLock ?? defaultLockProbe;
+    const LIVE = resolve(opts.in);
+    const dir = dirname(LIVE);
+    // --- Step 1: resolve + classify (read-only) ---
+    const klass = classify(LIVE);
+    if (klass === 'missing') {
+        return { action: 'noop-missing', exitCode: 1,
+            message: `No hmem store at ${LIVE}. Nothing to migrate.` };
+    }
+    if (klass === 'v2') {
+        return { action: 'noop-already-v2', exitCode: 0,
+            message: `Already v2 (${LIVE}). Nothing to do.` };
+    }
+    if (klass === 'ambiguous') {
+        return { action: 'refused-ambiguous', exitCode: 1,
+            message: `Cannot classify ${LIVE} as a v1 or v2 hmem store (neither memories nor v2 entries table). Refusing to migrate.` };
+    }
+    // klass === 'v1' below.
+    // --- --out side-by-side (advanced) mode: skip quiesce/backup/swap ---
+    // We still run the confirm/dry-run gates? Per §4, --out just runs migrate({in,out}).
+    // Dry-run is independent of --out: it always uses :memory:. Handle dry-run first.
+    // --- Step: dry-run (touches nothing) ---
+    if (opts.dryRun) {
+        try {
+            // same-path guard fires unconditionally in migrate(); pass a sentinel out so it
+            // doesn't trip. dryRun routes the migrator to :memory:; `out` is otherwise unused.
+            const sentinel = LIVE + '.dry-run-placeholder';
+            const res = migrate({ in: LIVE, out: sentinel, dryRun: true });
+            return { action: 'dry-run', exitCode: 0, report: res.report,
+                message: 'Dry run complete — no files were changed.' };
+        }
+        catch (e) {
+            return { action: 'failed', exitCode: 1, message: errMsg(e) };
+        }
+    }
+    // --- Step 2: quiesce preflight (Layer 1 — serve lockfile) ---
+    const lock = probeLock(dir, LIVE);
+    if (lock && lock.alive) {
+        return { action: 'refused-locked', exitCode: 2,
+            message: `An hmem MCP server (PID ${lock.pid}) is using this store. ` +
+                `Close Claude Code (or stop the server) and re-run \`hmem migrate\`.` };
+    }
+    if (lock && !lock.alive) {
+        log(`[hmem migrate] Ignoring a stale serve lockfile (PID ${lock.pid} is not running).`);
+    }
+    // --- --out side-by-side mode: migrate({in,out}), no backup/swap ---
+    if (opts.out) {
+        const OUT = resolve(opts.out);
+        // Layer 2 confirm (unless --yes) — still warn the user to quiesce.
+        if (!opts.yes) {
+            const ok = await runConfirm(opts.confirm, LIVE, OUT, /*sideBySide*/ true);
+            if (!ok)
+                return { action: 'aborted', exitCode: 0, message: 'Aborted by user.' };
+        }
+        try {
+            const res = migrate({ in: LIVE, out: OUT, dryRun: false });
+            if (res.skipped) {
+                return { action: 'noop-already-v2', exitCode: 0,
+                    message: `${OUT} is already a migrated v2 store. Nothing to do.` };
+            }
+            // validate the side-by-side output too
+            validate(OUT, sourceCounts(LIVE));
+            return { action: 'side-by-side', exitCode: 0, report: res.report,
+                message: `Wrote v2 store to ${OUT}. The original (${LIVE}) is unchanged.\n` +
+                    `Point HMEM_PATH at ${OUT} (or re-run \`hmem migrate\` in-place once ready).` };
+        }
+        catch (e) {
+            return { action: 'failed', exitCode: 1, message: errMsg(e) };
+        }
+    }
+    // --- In-place flow (§2 steps 2–9) ---
+    // --- Step 3: confirm (unless --yes) ---
+    if (!opts.yes) {
+        const ok = await runConfirm(opts.confirm, LIVE, undefined, /*sideBySide*/ false);
+        if (!ok)
+            return { action: 'aborted', exitCode: 0, message: 'Aborted by user.' };
+    }
+    // --- Step 4: backup (copy LIVE + sidecars verbatim) ---
+    const backupPath = `${LIVE}.v1-backup-${utcStamp()}`;
+    try {
+        copyFileSync(LIVE, backupPath);
+        for (const ext of ['-wal', '-shm']) {
+            if (existsSync(LIVE + ext))
+                copyFileSync(LIVE + ext, backupPath + ext);
+        }
+    }
+    catch (e) {
+        // backup failed → abort, LIVE untouched. Clean any partial backup.
+        cleanup([backupPath, backupPath + '-wal', backupPath + '-shm']);
+        return { action: 'failed', exitCode: 1,
+            message: `Backup failed (${errMsg(e)}). LIVE is unchanged; nothing was migrated.` };
+    }
+    // --- Step 5: migrate to TMP ---
+    const TMP = `${LIVE}.v2-migrating-${process.pid}-${Date.now()}.tmp`;
+    let report;
+    try {
+        const res = migrate({ in: LIVE, out: TMP, dryRun: false });
+        if (res.skipped) {
+            // Unexpected: classify said v1 but migrator found the marker. Treat as failure
+            // (ROLLBACK A) — LIVE is untouched (migrate opens it read-only).
+            cleanup([TMP, TMP + '-wal', TMP + '-shm']);
+            return { action: 'failed', exitCode: 1, backupPath,
+                message: 'Migrator unexpectedly reported the source as already-migrated. LIVE is unchanged; backup kept.' };
+        }
+        report = res.report;
+    }
+    catch (e) {
+        cleanup([TMP, TMP + '-wal', TMP + '-shm']);
+        return { action: 'failed', exitCode: 1, backupPath,
+            message: `Migration failed (${errMsg(e)}). LIVE is unchanged (source was read-only); backup kept at ${backupPath}.` };
+    }
+    // --- Step 6: validate TMP (read-only) ---
+    try {
+        validate(TMP, sourceCounts(LIVE));
+    }
+    catch (e) {
+        cleanup([TMP, TMP + '-wal', TMP + '-shm']);
+        return { action: 'failed', exitCode: 1, backupPath,
+            message: `Validation of the migrated store failed (${errMsg(e)}). ` +
+                `LIVE is unchanged; backup kept at ${backupPath}.` };
+    }
+    // --- Step 7: atomic swap (renameSync) + delete stale v1 sidecars ---
+    try {
+        renameSync(TMP, LIVE);
+    }
+    catch (e) {
+        // ROLLBACK B (Windows EBUSY etc.): TMP intact, LIVE intact.
+        return { action: 'failed', exitCode: 2, backupPath,
+            message: `Could not replace the live store (${errMsg(e)}). ` +
+                `Close all tools using ${LIVE} and re-run. LIVE is unchanged; ` +
+                `the migrated file is at ${TMP}; backup kept at ${backupPath}.` };
+    }
+    // Delete the now-stale -wal/-shm left over from the OLD v1 file (the new v2 file
+    // creates its own on next open). Best-effort.
+    cleanup([LIVE + '-wal', LIVE + '-shm']);
+    // --- Step 8: post-swap verify ---
+    // The v1 source is gone after the swap, so the count-sanity check has nothing to
+    // compare against; pass a relaxed source so only the structural/integrity checks
+    // run (these are what catch a corrupt swap). The exact count invariant was already
+    // enforced against the real source in step 6.
+    try {
+        validate(LIVE, RELAXED_SOURCE_COUNTS);
+    }
+    catch (e) {
+        // Should be impossible after step 6. Emergency restore from backup.
+        try {
+            copyFileSync(backupPath, LIVE);
+            cleanup([LIVE + '-wal', LIVE + '-shm']);
+            if (existsSync(backupPath + '-wal'))
+                copyFileSync(backupPath + '-wal', LIVE + '-wal');
+            if (existsSync(backupPath + '-shm'))
+                copyFileSync(backupPath + '-shm', LIVE + '-shm');
+        }
+        catch { /* restore best-effort; backup still on disk for the user */ }
+        return { action: 'failed', exitCode: 1, backupPath,
+            message: `Post-swap verification failed (${errMsg(e)}). Restored from backup. ` +
+                `Your backup is at ${backupPath}.` };
+    }
+    // The read-only verify above opens the WAL-mode db and leaves empty -wal/-shm
+    // sidecars (a read-only connection can't delete them on close). They're freshly
+    // created and contain no committed frames; remove them so a clean migrate leaves
+    // exactly one file. The next real open recreates them as needed.
+    cleanup([LIVE + '-wal', LIVE + '-shm']);
+    // --- Step 9: report + keep backup ---
+    return {
+        action: 'migrated', exitCode: 0, backupPath, report,
+        message: buildSuccessReport(LIVE, backupPath, report),
+    };
+}
+/** Source counts that disable the count-sanity check (entries can never exceed this). */
+const RELAXED_SOURCE_COUNTS = {
+    memories: Number.MAX_SAFE_INTEGER, memoryNodes: Number.MAX_SAFE_INTEGER,
+};
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+function errMsg(e) {
+    return e instanceof Error ? e.message : String(e);
+}
+function cleanup(paths) {
+    for (const p of paths) {
+        try {
+            if (existsSync(p))
+                rmSync(p);
+        }
+        catch { /* ignore */ }
+    }
+}
+async function runConfirm(confirm, live, out, _sideBySide) {
+    if (confirm)
+        return confirm();
+    return promptYesNo(live, out);
+}
+function buildSuccessReport(live, backupPath, report) {
+    const lines = [
+        `✓ Migrated ${live} to the v2 schema.`,
+        `  Backup (v1) kept at: ${backupPath}`,
+    ];
+    if (report) {
+        const total = Object.values(report.entriesByPrefix).reduce((a, b) => a + b, 0);
+        lines.push(`  Entries: ${total} | sessions: ${report.sessionsReconstructed} | events: ${report.eventsWritten}`);
+        lines.push(`  Links resolved: ${report.linksResolved} | dangling: ${report.linksDangling.length}`);
+    }
+    lines.push('');
+    lines.push('Your store is now v2. To sync it:');
+    lines.push('  hmem sync push   # the first push uploads the full v2 store; later pushes are incremental.');
+    lines.push('If you use multiple devices, run `hmem migrate` on each — until then, other devices cannot sync.');
+    return lines.join('\n');
+}
+/** Default interactive double-confirm prompt (Layer 2, §3). Reads y/N from stdin. */
+async function promptYesNo(live, out) {
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    const ask = (q) => new Promise(res => rl.question(q, ans => res(ans)));
+    try {
+        console.log('');
+        console.log('Before migrating, fully QUIT Claude Code (and any other tool using this store).');
+        console.log('Migration replaces the store file; a writer left open can lose data.');
+        console.log(`  Source (v1):  ${live}`);
+        if (out)
+            console.log(`  Output (v2):  ${out} (the original stays unchanged)`);
+        else
+            console.log('  The live file will be replaced in place (a timestamped v1 backup is kept).');
+        const a = (await ask(`Have you closed all tools using ${live}? [y/N] `)).trim().toLowerCase();
+        return a === 'y' || a === 'yes';
+    }
+    finally {
+        rl.close();
+    }
+}
+// ---------------------------------------------------------------------------
+// CLI entry: runMigrate
+// ---------------------------------------------------------------------------
+export async function runMigrate(argv) {
+    const getFlag = (k) => {
+        const i = argv.indexOf(k);
+        return i >= 0 ? argv[i + 1] : undefined;
+    };
+    const inPath = getFlag('--in') ?? resolveHmemPath();
+    const outPath = getFlag('--out');
+    const dryRun = argv.includes('--dry-run');
+    const yes = argv.includes('--yes') || argv.includes('-y');
+    const keepBackup = argv.includes('--keep-backup'); // default-true no-op confirming flag
+    const outcome = await migratePlan({
+        in: inPath, out: outPath, dryRun, yes, keepBackup,
+    });
+    if (outcome.exitCode === 0) {
+        console.log(outcome.message);
+    }
+    else {
+        console.error(outcome.message);
+    }
+    process.exit(outcome.exitCode);
+}
+//# sourceMappingURL=cli-migrate.js.map

package/dist/cli-migrate.js.map

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

package/dist/cli-session-summary.d.ts

@@ -1,7 +1,7 @@
 /**
  * cli-session-summary.ts
  *
- * Spawns Haiku to write a session summary (L2 body) for a completed session.
+ * Spawns a checkpoint agent to write a session summary (L2 body) for a completed session.
  * Called async from SessionStart hook when previous session lacks a summary.
  *
  * Usage: hmem summarize-session O0048.3

package/dist/cli-session-summary.js

@@ -1,46 +1,17 @@
 /**
  * cli-session-summary.ts
  *
- * Spawns Haiku to write a session summary (L2 body) for a completed session.
+ * Spawns a checkpoint agent to write a session summary (L2 body) for a completed session.
  * Called async from SessionStart hook when previous session lacks a summary.
  *
  * Usage: hmem summarize-session O0048.3
  */
 import fs from "node:fs";
-import os from "node:os";
 import path from "node:path";
-import { execFileSync, execSync } from "node:child_process";
 import { HmemStore } from "./hmem-store.js";
 import { loadHmemConfig } from "./hmem-config.js";
 import { resolveEnvDefaults } from "./cli-env.js";
-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 config = {
-        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-session-summary-"));
-    fs.chmodSync(tmpDir, 0o700);
-    const tmpPath = path.join(tmpDir, "mcp-config.json");
-    fs.writeFileSync(tmpPath, JSON.stringify(config), "utf8");
-    return tmpPath;
-}
+import { runCheckpointAgent } from "./cli-checkpoint-agent.js";
 export async function summarizeSession(sessionId) {
     if (!sessionId) {
         console.error("[hmem summarize-session] No session ID provided");
@@ -55,20 +26,16 @@ export async function summarizeSession(sessionId) {
         process.exit(0);
     const config = loadHmemConfig(path.dirname(hmemPath));
     const store = new HmemStore(hmemPath, config);
-    let mcpConfigPath = "";
     try {
-        // Get all L3 batch nodes for this session
         const batches = store.getChildNodes(sessionId);
         if (batches.length === 0)
             return;
         const batchSummaries = batches
-            .filter(b => b.depth === 3 && b.content !== b.title) // only batches with actual summaries
+            .filter(b => b.depth === 3 && b.content !== b.title)
             .map(b => `${b.id}: ${b.content}`)
             .join("\n\n");
         if (!batchSummaries)
-            return; // no summaries to work with
-        store.close();
-        mcpConfigPath = buildMcpConfig(projectDir, hmemPath);
+            return;
         const prompt = `Summarize session ${sessionId}.
 
 == Batch Summaries ==
@@ -80,29 +47,17 @@ What was achieved? What's still open?
 Match the language of the batch summaries.
 
 update_memory(id="${sessionId}", content="Session summary text here")`;
-        const allowedTools = "mcp__hmem__update_memory mcp__hmem__read_memory";
-        execFileSync("claude", [
-            "-p", "--model", "haiku",
-            "--mcp-config", mcpConfigPath,
-            "--allowedTools", allowedTools,
-            "--dangerously-skip-permissions",
-        ], { input: prompt, encoding: "utf8", timeout: 60_000 });
-        console.log(`[hmem] Session summary written for ${sessionId}`);
+        await runCheckpointAgent(prompt, store, config, hmemPath);
+        console.log(`[hmem] Session summary written for ${sessionId} (${config.checkpointProvider}/${config.checkpointModel})`);
     }
     catch (e) {
         console.error(`[hmem summarize-session] ${e}`);
     }
     finally {
-        if (mcpConfigPath) {
-            try {
-                fs.unlinkSync(mcpConfigPath);
-            }
-            catch { }
-            try {
-                fs.rmdirSync(path.dirname(mcpConfigPath));
-            }
-            catch { }
+        try {
+            store.close();
         }
+        catch { }
     }
 }
 //# sourceMappingURL=cli-session-summary.js.map

package/dist/cli-session-summary.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli-session-summary.js","sourceRoot":"","sources":["../src/cli-session-summary.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli-session-summary.js","sourceRoot":"","sources":["../src/cli-session-summary.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,SAAiB;IACtD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,iDAAiD,CAAC,CAAC;QACjE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,kBAAkB,EAAE,CAAC;IACrB,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAiB,CAAC;IACjD,IAAI,CAAC,UAAU;QAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAEjC,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,SAAU,CAAC;IACxC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAE9C,MAAM,MAAM,GAAG,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAE9C,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC/C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAEjC,MAAM,cAAc,GAAG,OAAO;aAC3B,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,KAAK,CAAC,CAAC,KAAK,CAAC;aACnD,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;aACjC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEhB,IAAI,CAAC,cAAc;YAAE,OAAO;QAE5B,MAAM,MAAM,GAAG,qBAAqB,SAAS;;;EAG/C,cAAc;;;iEAGiD,SAAS;;;;oBAItD,SAAS,yCAAyC,CAAC;QAEnE,MAAM,kBAAkB,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC1D,OAAO,CAAC,GAAG,CAAC,sCAAsC,SAAS,KAAK,MAAM,CAAC,kBAAkB,IAAI,MAAM,CAAC,eAAe,GAAG,CAAC,CAAC;IAE1H,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,4BAA4B,CAAC,EAAE,CAAC,CAAC;IACjD,CAAC;YAAS,CAAC;QACT,IAAI,CAAC;YAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACjC,CAAC;AACH,CAAC"}

package/dist/cli-statusline.js

@@ -69,7 +69,7 @@ function buildContextBar(input) {
     return `${color}[${bar}]${C.reset} ${C.white}${tokLabel}${C.reset}`;
 }
 async function getHmemStatus(sessionId) {
-    const empty = { project: "", device: "", exchanges: 0, interval: 0 };
+    const empty = { project: "", device: "", exchanges: 0, interval: 0, oSession: "" };
     const CACHE_FILE = cacheFile(sessionId);
     // Check cache
     try {
@@ -101,10 +101,13 @@ async function getHmemStatus(sessionId) {
             // Active project — per-session marker lookup
             const { readSessionMarker } = await import("./session-state.js");
             const marker = sessionId ? readSessionMarker(sessionId) : null;
+            // O-sub-node ID for this session (written by Stop-Hook after first exchange).
+            // Suppress when the session is explicitly deactivated (post-/clear).
+            const oSession = (marker && !marker.deactivated && marker.oSessionId) ? marker.oSessionId : "";
             let projRow;
             if (marker?.projectId) {
                 // Session marker has an explicit project → use it
-                projRow = db.prepare("SELECT id, title FROM memories WHERE id = ? AND prefix='P' AND obsolete!=1 LIMIT 1").get(marker.projectId);
+                projRow = db.prepare("SELECT id, title, level_1 FROM memories WHERE id = ? AND prefix='P' AND obsolete!=1 LIMIT 1").get(marker.projectId);
             }
             else if (marker?.deactivated) {
                 // Explicitly deactivated after /clear → show "no project", skip all fallbacks
@@ -119,25 +122,25 @@ async function getHmemStatus(sessionId) {
                 // handle the bash-intermediary case transparently.
                 const activeFromFile = readActiveProjectForCurrentProcess();
                 if (activeFromFile) {
-                    projRow = db.prepare("SELECT id, title FROM memories WHERE id = ? AND prefix='P' AND obsolete!=1 LIMIT 1").get(activeFromFile);
+                    projRow = db.prepare("SELECT id, title, level_1 FROM memories WHERE id = ? AND prefix='P' AND obsolete!=1 LIMIT 1").get(activeFromFile);
                 }
                 if (!projRow) {
                     // Fallback 2: shared DB active flag (legacy — unreliable in multi-session setups)
-                    projRow = db.prepare("SELECT id, title FROM memories WHERE prefix='P' AND active=1 AND obsolete!=1 LIMIT 1").get();
+                    projRow = db.prepare("SELECT id, title, level_1 FROM memories WHERE prefix='P' AND active=1 AND obsolete!=1 LIMIT 1").get();
                 }
             }
             let project = "";
             if (projRow) {
-                const name = (projRow.title ?? projRow.id).split("|")[0].trim();
+                const name = (projRow.title ?? projRow.level_1 ?? projRow.id).split("|")[0].trim();
                 project = `${projRow.id} ${name}`;
             }
             // Active device — global per-machine file
             let device = "";
             const deviceId = getActiveDevice();
             if (deviceId) {
-                const devRow = db.prepare("SELECT id, title FROM memories WHERE id = ? AND prefix='I' AND obsolete!=1 LIMIT 1").get(deviceId);
+                const devRow = db.prepare("SELECT id, title, level_1 FROM memories WHERE id = ? AND prefix='I' AND obsolete!=1 LIMIT 1").get(deviceId);
                 if (devRow) {
-                    device = (devRow.title ?? deviceId).split("|")[0].trim();
+                    device = (devRow.title ?? devRow.level_1 ?? deviceId).split("|")[0].trim();
                 }
                 else {
                     device = deviceId;
@@ -159,14 +162,14 @@ async function getHmemStatus(sessionId) {
                     const batchExchanges = db.prepare("SELECT COUNT(*) as n FROM memory_nodes WHERE parent_id = ? AND depth = 4").get(latestBatch.id)?.n ?? 0;
                     const interval = hmemConfig.checkpointInterval;
                     exchanges = batchExchanges;
-                    status = { project, device, exchanges, interval };
+                    status = { project, device, exchanges, interval, oSession };
                 }
                 else {
-                    status = { project, device, exchanges: 0, interval: hmemConfig.checkpointInterval };
+                    status = { project, device, exchanges: 0, interval: hmemConfig.checkpointInterval, oSession };
                 }
             }
             else {
-                status = { project, device, exchanges: 0, interval: hmemConfig.checkpointInterval };
+                status = { project, device, exchanges: 0, interval: hmemConfig.checkpointInterval, oSession };
             }
         }
         finally {
@@ -207,7 +210,8 @@ export async function statusline() {
         parts.push(`${C.gray}identify device${C.reset}`);
     }
     if (status.project) {
-        parts.push(`${C.cyan}${status.project}${C.reset}`);
+        const oTag = status.oSession ? ` ${C.gray}→${C.reset} ${C.cyan}${status.oSession}${C.reset}` : "";
+        parts.push(`${C.cyan}${status.project}${C.reset}${oTag}`);
     }
     else {
         parts.push(`${C.gray}no project${C.reset}`);