@hasna/mementos 0.14.84 → 0.14.86

package/dist/cli/index.js

@@ -1011,7 +1011,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
         this._exitCallback = (err) => {
           if (err.code !== "commander.executeSubCommandAsync") {
             throw err;
-          } else {}
+          }
         };
       }
       return this;
@@ -2274,6 +2274,7 @@ function translateSql(sql) {
   let translated = sql.replace(/\?/g, () => `$${++parameterIndex}`);
   const ISO_FMT = `'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'`;
   translated = translated.replace(/datetime\s*\(\s*'now'\s*\)/gi, `to_char(now() AT TIME ZONE 'UTC', ${ISO_FMT})`);
+  translated = translated.replace(/strftime\s*\(\s*'%Y-%m-%dT%H:%M:%fZ'\s*,\s*'now'\s*\)/gi, `to_char(now() AT TIME ZONE 'UTC', ${ISO_FMT})`);
   translated = translated.replace(/datetime\s*\(\s*'now'\s*,\s*'(-?\d+)\s+(minutes?|hours?|days?|seconds?)'\s*\)/gi, (_match, amount, unit) => {
     const parsed = parseInt(String(amount), 10);
     const absolute = Math.abs(parsed);
@@ -2758,16 +2759,24 @@ function transferRows(target, table, rows, options) {
   const conflictColumn = options.conflictColumn ?? "updated_at";
   let written = 0;
   let skipped = 0;
+  let maxSyncedAt = null;
   const errors = [];
+  const bumpMaxSyncedAt = (row) => {
+    const value = row[conflictColumn];
+    if (typeof value === "string" && (maxSyncedAt === null || value > maxSyncedAt)) {
+      maxSyncedAt = value;
+    }
+  };
   if (rows.length === 0) {
-    return { written, skipped, errors };
+    return { written, skipped, errors, maxSyncedAt };
   }
   const columns = Object.keys(rows[0] ?? {});
   if (!columns.includes(primaryKey)) {
     return {
       written,
       skipped,
-      errors: [`Table "${table}" has no "${primaryKey}" column; skipping`]
+      errors: [`Table "${table}" has no "${primaryKey}" column; skipping`],
+      maxSyncedAt
     };
   }
   const hasConflictColumn = columns.includes(conflictColumn);
@@ -2780,6 +2789,7 @@ function transferRows(target, table, rows, options) {
           const incomingTime = Date.parse(String(row[conflictColumn]));
           if (Number.isFinite(existingTime) && Number.isFinite(incomingTime) && existingTime >= incomingTime) {
             skipped++;
+            bumpMaxSyncedAt(row);
             continue;
           }
         }
@@ -2792,11 +2802,12 @@ function transferRows(target, table, rows, options) {
         target.run(`INSERT INTO "${table}" (${columnList}) VALUES (${placeholders})`, ...columns.map((column) => row[column]));
       }
       written++;
+      bumpMaxSyncedAt(row);
     } catch (error) {
       errors.push(`Row ${String(row[primaryKey] ?? "unknown")}: ${error instanceof Error ? error.message : String(error)}`);
     }
   }
-  return { written, skipped, errors };
+  return { written, skipped, errors, maxSyncedAt };
 }
 function incrementalSyncPush(local, remote, tables, options = {}) {
   return runIncrementalSync("push", local, remote, local, tables, options);
@@ -2834,22 +2845,29 @@ function runIncrementalSync(direction, source, target, metaDb, tables, options)
         rows = source.all(`SELECT * FROM "${table}"`);
         stat.first_sync = true;
       }
+      let maxSyncedAt = null;
       for (let offset = 0;offset < rows.length; offset += batchSize) {
         const batch = rows.slice(offset, offset + batchSize);
         const result = transferRows(target, table, batch, options);
         stat.synced_rows += result.written;
         stat.skipped_rows += result.skipped;
         stat.errors.push(...result.errors);
+        if (result.maxSyncedAt !== null && (maxSyncedAt === null || result.maxSyncedAt > maxSyncedAt)) {
+          maxSyncedAt = result.maxSyncedAt;
+        }
       }
       if (rows.length === 0) {
         stat.skipped_rows = stat.total_rows;
       }
-      upsertSyncMeta(metaDb, {
-        table_name: table,
-        last_synced_at: new Date().toISOString(),
-        last_synced_row_count: stat.synced_rows,
-        direction
-      });
+      const nextCursor = maxSyncedAt ?? meta?.last_synced_at ?? null;
+      if (rows.length > 0 && stat.errors.length === 0 && nextCursor !== null) {
+        upsertSyncMeta(metaDb, {
+          table_name: table,
+          last_synced_at: nextCursor,
+          last_synced_row_count: stat.synced_rows,
+          direction
+        });
+      }
     } catch (error) {
       stat.errors.push(`Table "${table}": ${error instanceof Error ? error.message : String(error)}`);
     }
@@ -2877,8 +2895,13 @@ var init_storage = __esm(() => {
     data;
     closed = false;
     lastError = null;
+    generation = 0;
     static DATA_BYTES = 128 * 1024 * 1024;
-    static QUERY_TIMEOUT_MS = 60000;
+    static queryTimeoutMs() {
+      const raw = process.env["MEMENTOS_PGSYNC_QUERY_TIMEOUT_MS"]?.trim();
+      const parsed = raw ? Number(raw) : Number.NaN;
+      return Number.isFinite(parsed) && parsed > 0 ? parsed : 60000;
+    }
     static resolveWorkerPath() {
       const ext = import.meta.url.endsWith(".ts") ? ".ts" : ".js";
       const here = fileURLToPath(new URL(".", import.meta.url));
@@ -2893,12 +2916,12 @@ var init_storage = __esm(() => {
       }
       return candidates[0];
     }
-    constructor(connectionString) {
-      const control = new SharedArrayBuffer(8);
+    constructor(connectionString, workerPath) {
+      const control = new SharedArrayBuffer(12);
       const dataSab = new SharedArrayBuffer(PgSyncPool.DATA_BYTES);
       this.status = new Int32Array(control);
       this.data = new Uint8Array(dataSab);
-      this.worker = new Worker(PgSyncPool.resolveWorkerPath(), {
+      this.worker = new Worker(workerPath ?? PgSyncPool.resolveWorkerPath(), {
         workerData: {
           dsn: stripSslParams(connectionString),
           ssl: sslConfigFor(connectionString),
@@ -2916,21 +2939,35 @@ var init_storage = __esm(() => {
         throw new Error("PgSyncPool is closed");
       if (this.lastError)
         throw this.lastError;
+      const timeoutMs = PgSyncPool.queryTimeoutMs();
+      const gen = ++this.generation;
       Atomics.store(this.status, 0, 0);
-      this.worker.postMessage({ sql, params });
-      const waitResult = Atomics.wait(this.status, 0, 0, PgSyncPool.QUERY_TIMEOUT_MS);
-      const code = Atomics.load(this.status, 0);
-      if (code === 0 || waitResult === "timed-out") {
-        if (this.lastError)
-          throw this.lastError;
-        throw new Error("PostgreSQL query timed out after 60s");
-      }
-      const len = Atomics.load(this.status, 1);
-      const payload = JSON.parse(new TextDecoder().decode(this.data.subarray(0, len)));
-      if (code === 2) {
-        throw new Error(payload.message ?? "PostgreSQL error");
+      Atomics.store(this.status, 2, 0);
+      this.worker.postMessage({ sql, params, gen });
+      const deadline = Date.now() + timeoutMs;
+      for (;; ) {
+        const remaining = deadline - Date.now();
+        const responding = Atomics.load(this.status, 0);
+        if (responding === gen) {
+          const code = Atomics.load(this.status, 2);
+          const len = Atomics.load(this.status, 1);
+          const payload = JSON.parse(new TextDecoder().decode(this.data.subarray(0, len)));
+          if (code === 2) {
+            throw new Error(payload.message ?? "PostgreSQL error");
+          }
+          return payload;
+        }
+        if (responding !== 0) {
+          Atomics.compareExchange(this.status, 0, responding, 0);
+          continue;
+        }
+        if (remaining <= 0) {
+          if (this.lastError)
+            throw this.lastError;
+          throw new Error(`PostgreSQL query timed out after ${timeoutMs}ms`);
+        }
+        Atomics.wait(this.status, 0, 0, remaining);
       }
-      return payload;
     }
     end() {
       if (this.closed)
@@ -3171,7 +3208,16 @@ x-api-key: ${cfg.apiKey}
 function apiJson(method, path, body, options) {
   const raw = apiRequestRaw(method, path, body);
   if (raw.status >= 200 && raw.status < 300) {
-    const data = raw.body.trim() ? JSON.parse(raw.body) : undefined;
+    let data;
+    if (raw.body.trim()) {
+      try {
+        data = JSON.parse(raw.body);
+      } catch (e) {
+        throw new ApiRequestError(`mementos cloud ${method} ${path} returned status ${raw.status} with a body that is not valid JSON (${e instanceof Error ? e.message : String(e)}) \u2014 the response is truncated or the server is unhealthy`, raw.status, raw.body.slice(0, 500));
+      }
+    } else {
+      data = undefined;
+    }
     return { status: raw.status, data };
   }
   if (raw.status === 404 && options?.allow404) {
@@ -5258,8 +5304,12 @@ __export(exports_memories, {
   updateMemory: () => updateMemory,
   touchMemory: () => touchMemory,
   semanticSearch: () => semanticSearch,
+  reservedAgentIdViolation: () => reservedAgentIdViolation,
   parseMemoryRow: () => parseMemoryRow,
+  listMemoryHistoryPage: () => listMemoryHistoryPage,
   listMemoryHistory: () => listMemoryHistory,
+  listMemoriesPage: () => listMemoriesPage,
+  listMemoriesBounded: () => listMemoriesBounded,
   listMemories: () => listMemories,
   listLowTrustMemories: () => listLowTrustMemories,
   indexMemoryEmbedding: () => indexMemoryEmbedding,
@@ -5273,6 +5323,8 @@ __export(exports_memories, {
   getMemoriesByKey: () => getMemoriesByKey,
   deleteMemory: () => deleteMemory,
   createMemory: () => createMemory,
+  countMemoryHistory: () => countMemoryHistory,
+  countMemories: () => countMemories,
   cleanExpiredMemories: () => cleanExpiredMemories,
   bulkUpsertMemories: () => bulkUpsertMemories,
   bulkDeleteMemories: () => bulkDeleteMemories
@@ -5324,7 +5376,20 @@ function parseMemoryRow(row) {
     accessed_at: row["accessed_at"] || null
   };
 }
+function reservedAgentIdViolation(agentId) {
+  if (!agentId)
+    return null;
+  const normalized = agentId.trim().toLowerCase();
+  if (RESERVED_AGENT_IDS.has(normalized)) {
+    return `Reserved placeholder agent id "${agentId}" cannot own a memory. ` + `Refusing to write: test harnesses must not write memories under placeholder agent ` + `identities. Register a real agent (mementos register-agent <name>) and pass its id.`;
+  }
+  return null;
+}
 function createMemory(input, dedupeMode = "merge", db) {
+  const reservedViolation = reservedAgentIdViolation(input.agent_id);
+  if (reservedViolation) {
+    throw new Error(reservedViolation);
+  }
   if (!db && isApiMode()) {
     const { status, data } = apiJson("POST", "/memories", { ...input, dedupe: dedupeMode });
     if (!data || !data.id) {
@@ -5374,7 +5439,8 @@ function createMemory(input, dedupeMode = "merge", db) {
            importance = ?, metadata = ?, expires_at = ?,
            when_to_use = ?,
            pinned = COALESCE(pinned, 0),
-           version = version + 1, updated_at = ?
+           version = version + 1, updated_at = ?,
+           updated_by_agent = ?
          WHERE id = ?`, [
         safeValue,
         input.category || "knowledge",
@@ -5385,6 +5451,7 @@ function createMemory(input, dedupeMode = "merge", db) {
         expiresAt,
         input.when_to_use || null,
         timestamp,
+        input.agent_id || null,
         existing.id
       ]);
       d.run("DELETE FROM memory_tags WHERE memory_id = ?", [existing.id]);
@@ -5489,6 +5556,12 @@ function bulkUpsertMemories(memories, db) {
         errors.push(`Rejected "${key}": ${formatEnumViolation(violation)}`);
         continue;
       }
+      const agentViolation = reservedAgentIdViolation(typeof mem["agent_id"] === "string" ? mem["agent_id"] : undefined);
+      if (agentViolation) {
+        rejected++;
+        errors.push(`Rejected "${key}": ${agentViolation}`);
+        continue;
+      }
       const timestamp = now();
       let tags = [];
       const rawTags = mem["tags"];
@@ -5639,29 +5712,7 @@ function getMemoriesByKey(key, scope, agentId, projectId, db) {
   const rows = d.query(sql).all(...params);
   return rows.map(parseMemoryRow);
 }
-function listMemories(filter, db) {
-  if (!db && isApiMode()) {
-    const f = filter || {};
-    const q = toQuery({
-      key: f.key,
-      scope: f.scope,
-      category: f.category,
-      status: f.status,
-      tags: f.tags,
-      min_importance: f.min_importance,
-      pinned: f.pinned,
-      agent_id: f.agent_id,
-      project_id: f.project_id,
-      session_id: f.session_id,
-      namespace: f.namespace,
-      as_of: f.as_of,
-      limit: f.limit,
-      offset: f.offset
-    });
-    const { data } = apiJson("GET", `/memories${q}`);
-    return data?.memories ?? [];
-  }
-  const d = db || getDatabase();
+function buildMemoryListConditions(filter) {
   const conditions = [];
   const params = [];
   if (filter) {
@@ -5773,21 +5824,114 @@ function listMemories(filter, db) {
   } else {
     conditions.push("status = 'active'");
   }
+  return { conditions, params };
+}
+function listMemoriesPage(filter, db) {
+  const f = filter || {};
+  if (!db && isApiMode()) {
+    const q = toQuery({
+      key: f.key,
+      scope: f.scope,
+      category: f.category,
+      status: f.status,
+      tags: f.tags,
+      min_importance: f.min_importance,
+      pinned: f.pinned,
+      agent_id: f.agent_id,
+      project_id: f.project_id,
+      session_id: f.session_id,
+      machine_id: f.machine_id,
+      visible_to_machine_id: f.visible_to_machine_id,
+      search: f.search,
+      source: f.source,
+      flag: f.flag,
+      namespace: f.namespace,
+      as_of: f.as_of,
+      limit: f.limit,
+      offset: f.offset
+    });
+    const { data } = apiJson("GET", `/memories${q}`);
+    return {
+      rows: data?.memories ?? [],
+      has_more: data?.has_more,
+      next_cursor: data?.next_cursor ?? null
+    };
+  }
+  const d = db || getDatabase();
+  const { conditions, params } = buildMemoryListConditions(f);
   let sql = "SELECT * FROM memories";
   if (conditions.length > 0) {
     sql += ` WHERE ${conditions.join(" AND ")}`;
   }
   sql += " ORDER BY importance DESC, created_at DESC";
-  if (filter?.limit) {
+  if (f.limit) {
     sql += " LIMIT ?";
-    params.push(filter.limit);
+    params.push(f.limit);
   }
-  if (filter?.offset) {
+  if (f.offset) {
     sql += " OFFSET ?";
-    params.push(filter.offset);
+    params.push(f.offset);
   }
   const rows = d.query(sql).all(...params);
-  return rows.map(parseMemoryRow);
+  const parsed = rows.map(parseMemoryRow);
+  const hasMore = f.limit !== undefined && parsed.length === f.limit;
+  return {
+    rows: parsed,
+    has_more: hasMore,
+    next_cursor: hasMore ? (f.offset ?? 0) + parsed.length : null
+  };
+}
+function listMemories(filter, db) {
+  return listMemoriesPage(filter, db).rows;
+}
+function listMemoriesBounded(filter = {}, target, db) {
+  const pageSize = 1000;
+  const maxPages = 1000;
+  const want = target === undefined ? undefined : target + 1;
+  const rows = [];
+  const seenCursors = new Set;
+  let cursor = filter.offset ?? 0;
+  let pages = 0;
+  for (;; ) {
+    if (want !== undefined && rows.length >= want)
+      break;
+    if (++pages > maxPages) {
+      throw new Error(`memories list traversal exceeded ${maxPages} pages while collecting rows \u2014 aborting (cursor cycle?)`);
+    }
+    const limit = Math.min(want === undefined ? pageSize : want - rows.length, pageSize);
+    const page = listMemoriesPage({ ...filter, limit, offset: cursor }, db);
+    rows.push(...page.rows);
+    if (page.has_more === false)
+      break;
+    if (page.has_more === undefined && page.rows.length < limit)
+      break;
+    if (page.has_more === true && (page.next_cursor === null || page.next_cursor === undefined)) {
+      throw new Error("memories list page claimed more results without a next cursor \u2014 aborting");
+    }
+    const next = page.next_cursor ?? cursor + page.rows.length;
+    if (seenCursors.has(next)) {
+      throw new Error("memories list traversal repeated a cursor \u2014 aborting");
+    }
+    seenCursors.add(next);
+    cursor = next;
+  }
+  const hasMore = target !== undefined && rows.length > target;
+  const trimmed = hasMore ? rows.slice(0, target) : rows;
+  return {
+    rows: trimmed,
+    has_more: hasMore,
+    next_cursor: hasMore ? (filter.offset ?? 0) + trimmed.length : null
+  };
+}
+function countMemories(filter, db) {
+  const d = db || getDatabase();
+  const { conditions, params } = buildMemoryListConditions(filter);
+  let sql = "SELECT COUNT(*) AS c FROM memories";
+  if (conditions.length > 0) {
+    sql += ` WHERE ${conditions.join(" AND ")}`;
+  }
+  const row = d.query(sql).get(...params);
+  return row?.c ?? 0;
 }
 function getMemoryBriefing(opts, db) {
   const limit = opts.limit ?? 20;
@@ -5849,13 +5993,17 @@ function listLowTrustMemories(opts = {}, db) {
   const rows = d.prepare(`SELECT * FROM memories WHERE ${conditions.join(" AND ")} ORDER BY trust_score ASC LIMIT ? OFFSET ?`).all(...params);
   return rows.map(parseMemoryRow);
 }
-function listMemoryHistory(opts = {}, db) {
+function listMemoryHistoryPage(opts = {}, db) {
   const limit = opts.limit ?? 20;
   const offset = opts.offset ?? 0;
   if (!db && isApiMode()) {
     const q = toQuery({ limit, offset });
     const { data } = apiJson("GET", `/memories/history${q}`);
-    return data?.memories ?? [];
+    return {
+      rows: data?.memories ?? [],
+      has_more: data?.has_more,
+      next_cursor: data?.next_cursor ?? null
+    };
   }
   const d = db || getDatabase();
   const params = [limit];
@@ -5865,7 +6013,21 @@ function listMemoryHistory(opts = {}, db) {
     params.push(offset);
   }
   const rows = d.query(sql).all(...params);
-  return rows.map(parseMemoryRow);
+  const parsed = rows.map(parseMemoryRow);
+  const hasMore = parsed.length === limit;
+  return {
+    rows: parsed,
+    has_more: hasMore,
+    next_cursor: hasMore ? offset + parsed.length : null
+  };
+}
+function listMemoryHistory(opts = {}, db) {
+  return listMemoryHistoryPage(opts, db).rows;
+}
+function countMemoryHistory(db) {
+  const d = db || getDatabase();
+  const row = d.query("SELECT COUNT(*) AS c FROM memories WHERE status = 'active' AND accessed_at IS NOT NULL").get();
+  return row?.c ?? 0;
 }
 function getMemoryChain(sequenceGroup, projectId, db) {
   if (!db && isApiMode()) {
@@ -5962,20 +6124,29 @@ function updateMemory(id, input, db) {
     sets.push("when_to_use = ?");
     params.push(input.when_to_use ?? null);
   }
+  if (input.updated_by_agent !== undefined) {
+    sets.push("updated_by_agent = ?");
+    params.push(input.updated_by_agent ?? null);
+  }
   if (input.tags !== undefined) {
     sets.push("tags = ?");
     params.push(JSON.stringify(input.tags));
-    d.run("DELETE FROM memory_tags WHERE memory_id = ?", [memoryId]);
-    const insertTag = d.prepare("INSERT OR IGNORE INTO memory_tags (memory_id, tag) VALUES (?, ?)");
-    for (const tag of input.tags) {
-      insertTag.run(memoryId, tag);
-    }
   }
   params.push(memoryId);
-  const result = d.run(`UPDATE memories SET ${sets.join(", ")} WHERE id = ?`, params);
-  if (result.changes === 0) {
-    throw new Error(`Update affected no rows for memory ${memoryId}: the record was read but not written. ` + `This is a bug in @hasna/mementos, not a bad argument \u2014 please report it.`);
-  }
+  d.transaction(() => {
+    const res = d.run(`UPDATE memories SET ${sets.join(", ")} WHERE id = ?`, params);
+    if (res.changes === 0) {
+      throw new Error(`Update affected no rows for memory ${memoryId}: the record was read but not written. ` + `This is a bug in @hasna/mementos, not a bad argument \u2014 please report it.`);
+    }
+    if (input.tags !== undefined) {
+      d.run("DELETE FROM memory_tags WHERE memory_id = ?", [memoryId]);
+      const insertTag = d.prepare("INSERT OR IGNORE INTO memory_tags (memory_id, tag) VALUES (?, ?)");
+      for (const tag of input.tags) {
+        insertTag.run(memoryId, tag);
+      }
+    }
+    return res;
+  });
   const updated = getMemory(memoryId, d);
   if (input.value !== undefined) {
     try {
@@ -6146,7 +6317,7 @@ async function semanticSearch(queryText, options = {}, db) {
   scored.sort((a, b) => b.score - a.score);
   return scored.slice(0, limit);
 }
-var RECALL_PROMOTE_THRESHOLD = 3;
+var RESERVED_AGENT_IDS, RECALL_PROMOTE_THRESHOLD = 3;
 var init_memories = __esm(() => {
   init_types();
   init_database();
@@ -6156,9 +6327,32 @@ var init_memories = __esm(() => {
   init_poisoning();
   init_entity_memories();
   init_api_mode();
+  RESERVED_AGENT_IDS = new Set([
+    "agent-a",
+    "agent-x",
+    "agent-z",
+    "nonexistent-agent"
+  ]);
 });
 
 // src/db/agents.ts
+import { homedir as homedir3 } from "os";
+import { join as join5 } from "path";
+import { existsSync as existsSync4, readFileSync as readFileSync2 } from "fs";
+function resolveWritingAgentName() {
+  const envName = process.env["MEMENTOS_AGENT"]?.trim();
+  if (envName)
+    return envName;
+  try {
+    const path = join5(homedir3(), ".hasna", "conversations", "agent-id");
+    if (existsSync4(path)) {
+      const fileAgent = readFileSync2(path, "utf8").trim();
+      if (fileAgent)
+        return fileAgent;
+    }
+  } catch {}
+  return null;
+}
 function parseAgentRow(row) {
   return {
     id: row["id"],
@@ -6361,17 +6555,17 @@ var init_agents = __esm(() => {
 });
 
 // src/lib/package-version.ts
-import { readFileSync as readFileSync2 } from "fs";
-import { dirname as dirname2, join as join5 } from "path";
+import { readFileSync as readFileSync3 } from "fs";
+import { dirname as dirname2, join as join6 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 function getMementosPackageVersion() {
   const here = dirname2(fileURLToPath2(import.meta.url));
   for (const candidate of [
-    join5(here, "..", "..", "package.json"),
-    join5(here, "..", "package.json")
+    join6(here, "..", "..", "package.json"),
+    join6(here, "..", "package.json")
   ]) {
     try {
-      const parsed = JSON.parse(readFileSync2(candidate, "utf8"));
+      const parsed = JSON.parse(readFileSync3(candidate, "utf8"));
       if (typeof parsed.version === "string" && parsed.version.trim())
         return parsed.version;
     } catch {}
@@ -6391,6 +6585,92 @@ var init_types2 = __esm(() => {
   ];
 });
 
+// src/project-registration/historical-receipt.ts
+function supportsFleetResourcesHistoricalReceiptLookup(capability) {
+  return capability.authority_id === FLEET_RESOURCES_CURRENT_PROJECT_REGISTRATION_IDENTITY.authority_id && capability.tenant_id === FLEET_RESOURCES_CURRENT_PROJECT_REGISTRATION_IDENTITY.tenant_id && capability.corpus_id === FLEET_RESOURCES_CURRENT_PROJECT_REGISTRATION_IDENTITY.corpus_id;
+}
+var ROOT_TENANT_ID = "adfd95c7-ee8b-52cb-ae47-4ae65dae3313", FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION, FLEET_RESOURCES_HISTORICAL_RECEIPT, FLEET_RESOURCES_CURRENT_PROJECT_REGISTRATION_IDENTITY, FLEET_RESOURCES_HISTORICAL_LOOKUP_IDENTITY;
+var init_historical_receipt = __esm(() => {
+  FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION = {
+    authority: "mementos",
+    authority_route: "mementos.project-registration.v1",
+    package_version: "1.0.0-rc.3",
+    authority_id: "mementos",
+    tenant_id: "default",
+    corpus_id: "default",
+    operation_id: "op-cli-register-full",
+    step_id: "mementos_project",
+    resource_kind: "project",
+    direction: "forward",
+    target_selector: "wks_005285827590a93b70e5",
+    target_id: "mm_project_f75606ef14e51fb577a15882ba0ab8ed333b2c29",
+    idempotency_key: "prk_786cdc6babddeae1be8d5078d0f75322d1ea1010ac5d8a50",
+    receipt_id: "mmpr_a647f9908a33bb64bf137f584202590f91b72a33",
+    request_digest: "8eb0e3fee26fdb7edb8a444aeddaaedb79a84a5a36e742ae03616f62b19f5c22",
+    precondition_digest: "0b6c22fcf75d835f9f27308b1a9d40e8902e48a97da370fd56df5acacfcd968e",
+    result_revision: "2026-08-09T13:37:43.068Z",
+    result_digest: "26fb0dd5c5e20909d3653ab0ddd8fa45e5142728e4e66d595e2419f7ed40b036",
+    created_at: "2026-08-09T13:37:43.068Z",
+    identity_digest: "1108dd972c90e4989036fb6ecec7dde10f54641a697bd53cfcd64017f589ace7",
+    target_digest: "72789fcd60668eeb66ee068936d3afa96deadcb007228830c64b6de783b6dcef",
+    operation_digest: "d7e37bfb2c0d28f8c4086c53224cd855d14694f32807b74c102b61a99963f3c0",
+    idempotency_digest: "b56d8ec37efb818759cdd2ee3b58bc1401ac13384c8d64c1813bb5c198b1e376",
+    receipt_digest: "52ce90c5de6817989f107d9d27e06156962a2b9c365e34e16a57aa37886501a2",
+    response_digest: "2fa3ed508f5f192c18753b1205ced996340fdf02f735420d32db897fc239805c"
+  };
+  FLEET_RESOURCES_HISTORICAL_RECEIPT = {
+    receipt_id: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.receipt_id,
+    authority: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.authority,
+    route: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.authority_route,
+    package_version: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.package_version,
+    authority_id: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.authority_id,
+    tenant_id: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.tenant_id,
+    corpus_id: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.corpus_id,
+    operation_id: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.operation_id,
+    step_id: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.step_id,
+    resource_kind: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.resource_kind,
+    direction: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.direction,
+    idempotency_key: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.idempotency_key,
+    request_digest: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.request_digest,
+    precondition_digest: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.precondition_digest,
+    outcome: "accepted",
+    reason: null,
+    target_id: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.target_id,
+    result_revision: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.result_revision,
+    result_digest: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.result_digest,
+    duplicate_of_receipt_id: null,
+    accepted_receipt_id: null,
+    created_by_operation: true,
+    created_at: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.created_at
+  };
+  FLEET_RESOURCES_CURRENT_PROJECT_REGISTRATION_IDENTITY = {
+    authority_id: "mementos",
+    tenant_id: ROOT_TENANT_ID,
+    corpus_id: "mementos:postgresql"
+  };
+  FLEET_RESOURCES_HISTORICAL_LOOKUP_IDENTITY = {
+    source: {
+      authority: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.authority,
+      authority_route: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.authority_route,
+      package_version: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.package_version,
+      authority_id: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.authority_id,
+      tenant_id: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.tenant_id,
+      corpus_id: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.corpus_id,
+      operation_id: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.operation_id,
+      step_id: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.step_id,
+      resource_kind: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.resource_kind,
+      direction: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.direction,
+      target_selector: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.target_selector,
+      target_id: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.target_id,
+      idempotency_key: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.idempotency_key,
+      receipt_id: FLEET_RESOURCES_HISTORICAL_PROJECT_REGISTRATION.receipt_id
+    },
+    destination: FLEET_RESOURCES_CURRENT_PROJECT_REGISTRATION_IDENTITY,
+    lookup_only: true,
+    immutable_receipt: true
+  };
+});
+
 // src/project-registration/identity.ts
 function configuredValue(override, envKey) {
   return override?.trim() || process.env[envKey]?.trim() || null;
@@ -6417,12 +6697,13 @@ function resolveMementosProjectAuthorityIdentity(options = {}) {
 }
 function buildMementosProjectRegistrationCapability(options = {}) {
   const identity = resolveMementosProjectAuthorityIdentity(options);
-  return {
+  const capability = {
     authority: "mementos",
     route: MEMENTOS_PROJECT_REGISTRATION_ROUTE,
     package_version: options.packageVersion ?? getMementosPackageVersion(),
     ...identity,
     supported_resources: ["project"],
+    supported_historical_lookup_identities: [],
     conditional_create: true,
     immutable_receipts: true,
     exact_terminal_lookup: true,
@@ -6441,11 +6722,18 @@ function buildMementosProjectRegistrationCapability(options = {}) {
     stable_keyset_pagination: true,
     explicit_membership_only: true
   };
+  if (supportsFleetResourcesHistoricalReceiptLookup(capability)) {
+    capability.supported_historical_lookup_identities = [
+      FLEET_RESOURCES_HISTORICAL_LOOKUP_IDENTITY
+    ];
+  }
+  return capability;
 }
 var MEMENTOS_PROJECT_AUTHORITY_ENV, MementosProjectAuthorityIdentityError;
 var init_identity = __esm(() => {
   init_package_version();
   init_types2();
+  init_historical_receipt();
   MEMENTOS_PROJECT_AUTHORITY_ENV = {
     authorityId: "MEMENTOS_PROJECT_AUTHORITY_ID",
     tenantId: "MEMENTOS_PROJECT_TENANT_ID",
@@ -7272,6 +7560,7 @@ __export(exports_helpers, {
   colorImportance: () => colorImportance,
   colorEntityType: () => colorEntityType,
   colorCategory: () => colorCategory,
+  collectPagedRows: () => collectPagedRows,
   VALID_SCOPES: () => VALID_SCOPES,
   VALID_CATEGORIES: () => VALID_CATEGORIES,
   DEFAULT_SNIPPET_LENGTH: () => DEFAULT_SNIPPET_LENGTH,
@@ -7279,13 +7568,13 @@ __export(exports_helpers, {
   DEFAULT_COMPACT_LIMIT: () => DEFAULT_COMPACT_LIMIT
 });
 import chalk from "chalk";
-import { readFileSync as readFileSync3 } from "fs";
-import { dirname as dirname3, join as join6, resolve as resolve2 } from "path";
+import { readFileSync as readFileSync4 } from "fs";
+import { dirname as dirname3, join as join7, resolve as resolve2 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 function getPackageVersion() {
   try {
-    const pkgPath = join6(dirname3(fileURLToPath3(import.meta.url)), "..", "..", "package.json");
-    const pkg = JSON.parse(readFileSync3(pkgPath, "utf-8"));
+    const pkgPath = join7(dirname3(fileURLToPath3(import.meta.url)), "..", "..", "package.json");
+    const pkg = JSON.parse(readFileSync4(pkgPath, "utf-8"));
     return pkg.version || "0.0.0";
   } catch {
     return "0.0.0";
@@ -7358,6 +7647,39 @@ function truncateText(value, max = DEFAULT_SNIPPET_LENGTH) {
     return normalized.slice(0, max);
   return `${normalized.slice(0, max - 3)}...`;
 }
+function collectPagedRows(fetchPage, target, offset, opts = {}) {
+  const pageSize = opts.pageSize ?? 1000;
+  const maxPages = opts.maxPages ?? 1000;
+  const want = target === undefined ? undefined : target + 1;
+  const rows = [];
+  const seenCursors = new Set;
+  let cursor = offset;
+  let pages = 0;
+  for (;; ) {
+    if (want !== undefined && rows.length >= want)
+      break;
+    if (++pages > maxPages) {
+      throw new Error(`pagination exceeded ${maxPages} pages while collecting rows \u2014 aborting (cursor cycle?)`);
+    }
+    const limit = Math.min(want === undefined ? pageSize : want - rows.length, pageSize);
+    const page = fetchPage(cursor, limit);
+    rows.push(...page.rows);
+    if (page.has_more === false)
+      break;
+    if (page.has_more === undefined && page.rows.length < limit)
+      break;
+    if (page.has_more === true && (page.next_cursor === null || page.next_cursor === undefined)) {
+      throw new Error("pagination claimed more results without a next cursor \u2014 aborting");
+    }
+    const next = page.next_cursor ?? cursor + page.rows.length;
+    if (seenCursors.has(next)) {
+      throw new Error("pagination repeated a cursor \u2014 aborting");
+    }
+    seenCursors.add(next);
+    cursor = next;
+  }
+  return { rows, hasMore: target !== undefined && rows.length > target };
+}
 function printPageHint(opts) {
   const hints = [];
   const offset = opts.offset ?? 0;
@@ -7811,16 +8133,16 @@ function validateConfigKeyValue(key, value, DEFAULT_CONFIG) {
   return null;
 }
 function getConfigPath() {
-  const { homedir: homedir3 } = __require("os");
-  return join6(homedir3(), ".hasna", "mementos", "config.json");
+  const { homedir: homedir4 } = __require("os");
+  return join7(homedir4(), ".hasna", "mementos", "config.json");
 }
 function readFileConfig() {
-  const { existsSync: existsSync4 } = __require("fs");
+  const { existsSync: existsSync5 } = __require("fs");
   const configPath = getConfigPath();
-  if (!existsSync4(configPath))
+  if (!existsSync5(configPath))
     return {};
   try {
-    const data = JSON.parse(readFileSync3(configPath, "utf-8"));
+    const data = JSON.parse(readFileSync4(configPath, "utf-8"));
     if (data === null || typeof data !== "object" || Array.isArray(data)) {
       throw new Error("expected a JSON object");
     }
@@ -7831,10 +8153,10 @@ function readFileConfig() {
   }
 }
 function writeFileConfig(data) {
-  const { existsSync: existsSync4, writeFileSync: writeFileSync3, mkdirSync: mkdirSync3 } = __require("fs");
+  const { existsSync: existsSync5, writeFileSync: writeFileSync3, mkdirSync: mkdirSync3 } = __require("fs");
   const configPath = getConfigPath();
   const dir = dirname3(configPath);
-  if (!existsSync4(dir))
+  if (!existsSync5(dir))
     mkdirSync3(dir, { recursive: true });
   writeFileSync3(configPath, JSON.stringify(data, null, 2) + `
 `, "utf-8");
@@ -8262,7 +8584,7 @@ function buildFilterConditions(filter) {
   const conditions = [];
   const params = [];
   conditions.push("m.status = 'active'");
-  conditions.push("(m.expires_at IS NULL OR m.expires_at >= datetime('now'))");
+  conditions.push("(m.expires_at IS NULL OR m.expires_at >= strftime('%Y-%m-%dT%H:%M:%fZ', 'now'))");
   if (!filter)
     return { conditions, params };
   if (filter.scope) {
@@ -10342,7 +10664,7 @@ async function detectContradiction(newKey, newValue, options = {}, db) {
     conditions.push("project_id = ?");
     params.push(project_id);
   }
-  conditions.push("(valid_until IS NULL OR valid_until > datetime('now'))");
+  conditions.push("(valid_until IS NULL OR valid_until > strftime('%Y-%m-%dT%H:%M:%fZ', 'now'))");
   const sql = `SELECT * FROM memories WHERE ${conditions.join(" AND ")} ORDER BY importance DESC LIMIT 10`;
   const rows = d.query(sql).all(...params);
   if (rows.length === 0) {
@@ -11536,10 +11858,12 @@ var init_synthesis2 = __esm(() => {
 var exports_session_jobs = {};
 __export(exports_session_jobs, {
   updateSessionJob: () => updateSessionJob,
+  recoverStaleProcessingJobs: () => recoverStaleProcessingJobs,
   listSessionJobs: () => listSessionJobs,
   getSessionJob: () => getSessionJob,
   getNextPendingJob: () => getNextPendingJob,
-  createSessionJob: () => createSessionJob
+  createSessionJob: () => createSessionJob,
+  claimSessionJob: () => claimSessionJob
 });
 function parseJobRow(row) {
   return {
@@ -11669,6 +11993,18 @@ function getNextPendingJob(db) {
     return null;
   return parseJobRow(row);
 }
+function claimSessionJob(id, db) {
+  const d = db || getDatabase();
+  const startedAt = now();
+  const result = d.run("UPDATE session_memory_jobs SET status = 'processing', started_at = ? WHERE id = ? AND status = 'pending'", [startedAt, id]);
+  return result.changes;
+}
+function recoverStaleProcessingJobs(maxAgeMs, db) {
+  const d = db || getDatabase();
+  const cutoff = new Date(Date.now() - maxAgeMs).toISOString();
+  const result = d.run("UPDATE session_memory_jobs SET status = 'pending', started_at = NULL WHERE status = 'processing' AND started_at < ?", [cutoff]);
+  return result.changes;
+}
 var init_session_jobs = __esm(() => {
   init_database();
   init_api_mode();
@@ -12207,7 +12543,11 @@ async function processSessionJob(jobId, db) {
     return result;
   }
   try {
-    updateSessionJob(jobId, { status: "processing", started_at: new Date().toISOString() }, db);
+    const changes = claimSessionJob(jobId, db);
+    if (changes === 0) {
+      result.errors.push(`Job already claimed or not pending: ${jobId}`);
+      return result;
+    }
   } catch (e) {
     result.errors.push(`Failed to mark job as processing: ${String(e)}`);
     return result;
@@ -12330,6 +12670,9 @@ function startSessionQueueWorker() {
     return;
   _workerStarted = true;
   setInterval(() => {
+    try {
+      recoverStaleProcessingJobs(30 * 60 * 1000);
+    } catch {}
     _processNext();
   }, 5000);
 }
@@ -12383,13 +12726,13 @@ __export(exports_session_registry, {
   closeRegistry: () => closeRegistry,
   cleanStaleSessions: () => cleanStaleSessions
 });
-import { existsSync as existsSync8, mkdirSync as mkdirSync5 } from "fs";
-import { dirname as dirname6, join as join9 } from "path";
+import { existsSync as existsSync9, mkdirSync as mkdirSync5 } from "fs";
+import { dirname as dirname6, join as join10 } from "path";
 function getDb() {
   if (_db2)
     return _db2;
   const dir = dirname6(DB_PATH);
-  if (!existsSync8(dir))
+  if (!existsSync9(dir))
     mkdirSync5(dir, { recursive: true });
   _db2 = new SqliteAdapter(DB_PATH);
   _db2.run("PRAGMA journal_mode = WAL");
@@ -12564,7 +12907,7 @@ function closeRegistry() {
 var DB_PATH, _db2 = null;
 var init_session_registry = __esm(() => {
   init_storage();
-  DB_PATH = join9(process.env["HOME"] || process.env["USERPROFILE"] || "~", ".open-sessions-registry.db");
+  DB_PATH = join10(process.env["HOME"] || process.env["USERPROFILE"] || "~", ".open-sessions-registry.db");
 });
 
 // src/db/pg-migrations.ts
@@ -27040,7 +27383,7 @@ class JSONSchemaGenerator {
               if (val === undefined) {
                 if (this.unrepresentable === "throw") {
                   throw new Error("Literal `undefined` cannot be represented in JSON Schema");
-                } else {}
+                }
               } else if (typeof val === "bigint") {
                 if (this.unrepresentable === "throw") {
                   throw new Error("BigInt literals cannot be represented in JSON Schema");
@@ -48690,7 +49033,7 @@ var require_tracestate_impl = __commonJS((exports) => {
           const value = listMember.slice(i + 1, part.length);
           if ((0, tracestate_validators_1.validateKey)(key) && (0, tracestate_validators_1.validateValue)(value)) {
             agg.set(key, value);
-          } else {}
+          }
         }
         return agg;
       }, new Map);
@@ -62045,8 +62388,8 @@ var {
 
 // src/cli/index.tsx
 init_database();
-import { readFileSync as readFileSync9 } from "fs";
-import { dirname as dirname8, join as join13 } from "path";
+import { readFileSync as readFileSync10 } from "fs";
+import { dirname as dirname8, join as join14 } from "path";
 import { fileURLToPath as fileURLToPath5 } from "url";
 
 // src/db/machines.ts
@@ -63487,6 +63830,7 @@ import { createHash as createHash3 } from "crypto";
 init_projects();
 init_types2();
 init_identity();
+init_historical_receipt();
 function canonicalMementosProjectRegistrationJson(value) {
   return JSON.stringify(canonicalize2(value));
 }
@@ -64044,6 +64388,18 @@ function registerCrudCommands(program2) {
         }
         resolvedAgentId = ag.id;
       }
+      const requestedSource = opts.source;
+      const claimsAgentAuthor = !requestedSource || requestedSource === "agent";
+      if (!resolvedAgentId && claimsAgentAuthor) {
+        const writingName = resolveWritingAgentName();
+        if (writingName) {
+          resolvedAgentId = getAgent(writingName)?.id ?? registerAgent(writingName).id;
+        } else if (requestedSource === "agent") {
+          throw new Error(`No agent identity: an agent-source save needs a writing agent, and none could be resolved.
+` + `Pass --agent <name>, set MEMENTOS_AGENT, or write the fleet identity file ` + `(~/.hasna/conversations/agent-id, produced by "conversations agents register").
+` + `To write without claiming an agent author, omit --source or pass ` + `--source user|system|auto|imported.`);
+        }
+      }
       const input = {
         key,
         value,
@@ -64053,7 +64409,7 @@ function registerCrudCommands(program2) {
         tags: mergedTags,
         summary: opts.summary,
         ttl_ms: opts.ttl ? parseDuration(opts.ttl) : undefined,
-        source: opts.source,
+        source: requestedSource,
         agent_id: resolvedAgentId,
         session_id: globalOpts.session
       };
@@ -64120,6 +64476,10 @@ function registerCrudCommands(program2) {
       const updateInput = {
         version: existing.version
       };
+      const writingName = resolveWritingAgentName();
+      if (writingName) {
+        updateInput.updated_by_agent = getAgent(writingName)?.id ?? registerAgent(writingName).id;
+      }
       if (opts.value !== undefined)
         updateInput.value = opts.value;
       if (opts.importance !== undefined)
@@ -64147,7 +64507,7 @@ function registerCrudCommands(program2) {
         if (violation)
           throw new Error(formatEnumViolation(violation));
       }
-      const changedFields = Object.keys(updateInput).filter((k) => k !== "version");
+      const changedFields = Object.keys(updateInput).filter((k) => k !== "version" && k !== "updated_by_agent");
       if (changedFields.length === 0) {
         throw new Error(`Nothing to update: no fields were given for ${existing.key} (${existing.id.slice(0, 8)}). ` + `Pass at least one of --value, --scope, --category, --status, --importance, --tags, --summary, --pin/--unpin. ` + `Note that -s is the global --session, not --scope.`);
       }
@@ -64177,8 +64537,7 @@ function registerCrudCommands(program2) {
       }
       const matches = getMemoriesByKey(keyOrId, opts.scope, opts.agent, opts.project);
       if (matches.length === 0) {
-        const looksLikeId = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(keyOrId);
-        if (isApiMode() && looksLikeId && deleteMemory(keyOrId)) {
+        if (isApiMode() && keyOrId.length > 0 && deleteMemory(keyOrId)) {
           if (globalOpts.json) {
             outputJson({ deleted: keyOrId });
           } else {
@@ -64750,7 +65109,7 @@ function registerRemoveCommand(program2) {
       if (mem)
         id = mem.id;
     }
-    if (!id && isApiMode() && /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(nameOrId)) {
+    if (!id && isApiMode() && nameOrId.length > 0) {
       id = nameOrId;
     }
     if (!id) {
@@ -64878,15 +65237,17 @@ function registerListCommand(program2) {
       const fmt = getOutputFormat(program2, opts.format);
       const isStructured = fmt === "json" || fmt === "csv" || fmt === "yaml";
       const requestedLimit = opts.limit;
-      const limit = positiveIntOrDefault(requestedLimit, isStructured ? 50 : DEFAULT_COMPACT_LIMIT);
-      const offset = cursorOrOffset(opts.cursor, opts.offset);
+      const limit = requestedLimit === undefined ? isStructured ? undefined : DEFAULT_COMPACT_LIMIT : positiveIntOrDefault(requestedLimit, isStructured ? 50 : DEFAULT_COMPACT_LIMIT);
+      const offset = cursorOrOffset(opts.cursor, opts.offset) ?? 0;
       const agentId = resolveAgentFilter(opts.agent || globalOpts.agent);
       const projectPath = opts.project || globalOpts.project;
       let projectId;
       if (projectPath) {
         const project = getProject(resolve7(projectPath));
-        if (project)
-          projectId = project.id;
+        if (!project) {
+          throw new Error(`Project not found: ${projectPath}`);
+        }
+        projectId = project.id;
       }
       const filter = {
         scope: opts.scope,
@@ -64896,16 +65257,24 @@ function registerListCommand(program2) {
         pinned: opts.pinned ? true : undefined,
         agent_id: agentId,
         project_id: projectId,
-        limit: isStructured ? limit : limit + 1,
-        offset,
         status: opts.status,
         session_id: opts.session || globalOpts.session
       };
-      const fetched = listMemories(filter);
-      const hasMore = !isStructured && fetched.length > limit;
-      const memories = hasMore ? fetched.slice(0, limit) : fetched;
+      const { rows: collected, hasMore } = collectPagedRows((cursor, pageLimit) => {
+        const page = listMemoriesPage({
+          ...filter,
+          limit: pageLimit,
+          offset: cursor
+        });
+        return {
+          rows: page.rows,
+          has_more: page.has_more,
+          next_cursor: page.next_cursor
+        };
+      }, limit, offset);
+      const memories = hasMore && limit !== undefined ? collected.slice(0, limit) : collected;
       if (fmt === "json") {
-        outputJson(fetched);
+        outputJson(memories);
         return;
       }
       if (fmt === "csv") {
@@ -64933,7 +65302,7 @@ function registerListCommand(program2) {
       }
       printPageHint({
         shown: memories.length,
-        limit,
+        limit: limit ?? memories.length,
         offset,
         hasMore,
         command: "mementos list",
@@ -64973,7 +65342,10 @@ function getMemoryStats(db) {
   const byCategory = d.query("SELECT category, COUNT(*) as c FROM memories WHERE status = 'active' GROUP BY category").all();
   const byStatus = d.query("SELECT status, COUNT(*) as c FROM memories WHERE status = 'active' GROUP BY status").all();
   const pinnedCount = d.query("SELECT COUNT(*) as c FROM memories WHERE pinned = 1 AND status = 'active'").get().c;
-  const expiredCount = d.query("SELECT COUNT(*) as c FROM memories WHERE status = 'expired' OR (expires_at IS NOT NULL AND expires_at < datetime('now'))").get().c;
+  const expiredCount = d.query("SELECT COUNT(*) as c FROM memories WHERE status = 'expired'").get().c;
+  const expiresAtCount = d.query("SELECT COUNT(*) as c FROM memories WHERE expires_at IS NOT NULL").get().c;
+  const nowIso = new Date().toISOString();
+  const expiredDueCount = d.query("SELECT COUNT(*) as c FROM memories WHERE status = 'expired' OR (expires_at IS NOT NULL AND expires_at < ?)").get(nowIso).c;
   const stats = {
     total,
     by_scope: { global: 0, shared: 0, private: 0, working: 0 },
@@ -64981,7 +65353,9 @@ function getMemoryStats(db) {
     by_status: { active: 0, archived: 0, expired: 0 },
     by_agent: {},
     pinned_count: pinnedCount,
-    expired_count: expiredCount
+    expired_count: expiredCount,
+    expires_at_count: expiresAtCount,
+    expired_due_count: expiredDueCount
   };
   for (const row of byScope)
     if (row.scope in stats.by_scope)
@@ -65015,7 +65389,9 @@ function normalizeStats(data) {
     by_status: { active: 0, archived: 0, expired: 0, ...data?.by_status ?? {} },
     by_agent: data?.by_agent ?? {},
     pinned_count: data?.pinned_count ?? 0,
-    expired_count: data?.expired_count ?? 0
+    expired_count: data?.expired_count ?? 0,
+    expires_at_count: data?.expires_at_count ?? 0,
+    expired_due_count: data?.expired_due_count ?? 0
   };
 }
 function getMemoryReport(filter = {}, db) {
@@ -65068,19 +65444,31 @@ function getMemoryReport(filter = {}, db) {
     top_agents: topAgents
   };
 }
-function getStaleMemories(filter = {}, db) {
+function getStaleMemoriesPage(filter = {}, db) {
   const days = Math.min(filter.days || 30, 365);
   const limit = filter.limit ?? 20;
   const offset = filter.offset ?? 0;
   if (!db && isApiMode()) {
-    const q = toQuery({ days, project_id: filter.project_id, agent_id: filter.agent_id, limit, offset });
+    const q = toQuery({ days, project_id: filter.project_id, agent_id: filter.agent_id, pinned: filter.pinned, limit, offset });
     const { data } = apiJson("GET", `/memories/stale${q}`);
-    return data?.memories ?? [];
+    const rows2 = data?.memories ?? [];
+    return {
+      rows: rows2,
+      total: data?.total ?? rows2.length,
+      has_more: data?.has_more,
+      next_cursor: data?.next_cursor ?? null
+    };
   }
   const d = db || getDatabase();
   const cutoffDate = new Date(Date.now() - days * 86400000).toISOString();
-  const conds = ["status = 'active'", "(accessed_at IS NULL OR accessed_at < ?)", "pinned = 0"];
+  const conds = ["status = 'active'", "(accessed_at IS NULL OR accessed_at < ?)"];
   const params = [cutoffDate];
+  if (filter.pinned !== undefined) {
+    conds.push("pinned = ?");
+    params.push(filter.pinned ? 1 : 0);
+  } else {
+    conds.push("pinned = 0");
+  }
   if (filter.project_id) {
     conds.push("project_id = ?");
     params.push(filter.project_id);
@@ -65089,13 +65477,22 @@ function getStaleMemories(filter = {}, db) {
     conds.push("agent_id = ?");
     params.push(filter.agent_id);
   }
-  let sql = `SELECT id, key, value, importance, scope, category, accessed_at, access_count, created_at FROM memories WHERE ${conds.join(" AND ")} ORDER BY COALESCE(accessed_at, created_at) ASC LIMIT ?`;
+  const where = conds.join(" AND ");
+  const countRow = d.query(`SELECT COUNT(*) AS c FROM memories WHERE ${where}`).get(...params);
+  let sql = `SELECT id, key, value, importance, scope, category, accessed_at, access_count, created_at FROM memories WHERE ${where} ORDER BY COALESCE(accessed_at, created_at) ASC LIMIT ?`;
   params.push(limit);
   if (offset) {
     sql += " OFFSET ?";
     params.push(offset);
   }
-  return d.query(sql).all(...params);
+  const rows = d.query(sql).all(...params);
+  const hasMore = rows.length === limit;
+  return {
+    rows,
+    total: countRow?.c ?? 0,
+    has_more: hasMore,
+    next_cursor: hasMore ? offset + rows.length : null
+  };
 }
 
 // src/cli/commands/info-stats.ts
@@ -65248,14 +65645,14 @@ init_projects();
 init_helpers();
 function registerStaleCommand(program2) {
   const handleError = makeHandleError(program2);
-  program2.command("stale").description("Find memories not accessed recently (for cleanup/review)").option("--days <n>", "Stale threshold in days (default: 30)", parseInt).option("--project <path>", "Project filter").option("--agent <name>", "Agent filter").option("--limit <n>", "Max results (default: 20)", parseInt).option("--offset <n>", "Offset for pagination", parseInt).option("--cursor <n>", "Cursor offset for the next page", parseInt).option("--format <fmt>", "Output format: compact (default), json").option("--verbose", "Show wider memory snippets").action((opts) => {
+  program2.command("stale").description("Find memories not accessed recently (for cleanup/review)").option("--days <n>", "Stale threshold in days (default: 30)", parseInt).option("--pinned", "Review stale PINNED memories (default view excludes pinned)").option("--project <path>", "Project filter").option("--agent <name>", "Agent filter").option("--limit <n>", "Max results (default: 20)", parseInt).option("--offset <n>", "Offset for pagination", parseInt).option("--cursor <n>", "Cursor offset for the next page", parseInt).option("--format <fmt>", "Output format: compact (default), json").option("--verbose", "Show wider memory snippets").action((opts) => {
     try {
       const globalOpts = program2.opts();
       const days = opts.days || 30;
       const fmt = getOutputFormat(program2, opts.format);
       const isJson = fmt === "json";
       const limit = positiveIntOrDefault(opts.limit, isJson ? 20 : DEFAULT_COMPACT_LIMIT);
-      const offset = cursorOrOffset(opts.cursor, opts.offset);
+      const offset = cursorOrOffset(opts.cursor, opts.offset) ?? 0;
       const projectPath = opts.project || globalOpts.project;
       let projectId;
       if (projectPath) {
@@ -65264,17 +65661,37 @@ function registerStaleCommand(program2) {
           projectId = project.id;
       }
       const agentId = resolveAgentFilter(opts.agent || globalOpts.agent);
-      const rows = getStaleMemories({
-        days,
-        project_id: projectId,
-        agent_id: agentId,
-        limit: isJson ? limit : limit + 1,
-        offset
-      });
-      const hasMore = !isJson && rows.length > limit;
-      const displayRows = hasMore ? rows.slice(0, limit) : rows;
+      let staleTotal = 0;
+      let firstPage = true;
+      const { rows: collected, hasMore } = collectPagedRows((cursor, pageLimit) => {
+        const page = getStaleMemoriesPage({
+          days,
+          pinned: opts.pinned ? true : undefined,
+          project_id: projectId,
+          agent_id: agentId,
+          limit: pageLimit,
+          offset: cursor
+        });
+        if (firstPage) {
+          staleTotal = page.total;
+          firstPage = false;
+        }
+        return {
+          rows: page.rows,
+          has_more: page.has_more,
+          next_cursor: page.next_cursor
+        };
+      }, limit, offset);
+      const displayRows = hasMore ? collected.slice(0, limit) : collected;
       if (fmt === "json") {
-        outputJson({ stale_count: rows.length, threshold_days: days, memories: rows });
+        outputJson({
+          stale_count: staleTotal,
+          returned: displayRows.length,
+          threshold_days: days,
+          has_more: hasMore,
+          next_cursor: hasMore ? offset + displayRows.length : null,
+          memories: displayRows
+        });
         return;
       }
       if (displayRows.length === 0) {
@@ -65313,13 +65730,20 @@ function registerHistoryCommand(program2) {
     try {
       const globalOpts = program2.opts();
       const isJson = Boolean(globalOpts.json);
-      const limit = positiveIntOrDefault(opts.limit, isJson ? 20 : DEFAULT_SEARCH_LIMIT);
-      const offset = cursorOrOffset(opts.cursor, opts.offset);
-      const fetched = listMemoryHistory({ limit: isJson ? limit : limit + 1, offset });
-      const hasMore = !isJson && fetched.length > limit;
-      const memories = hasMore ? fetched.slice(0, limit) : fetched;
+      const requestedLimit = opts.limit;
+      const limit = requestedLimit === undefined ? isJson ? undefined : DEFAULT_SEARCH_LIMIT : positiveIntOrDefault(requestedLimit, isJson ? 20 : DEFAULT_SEARCH_LIMIT);
+      const offset = cursorOrOffset(opts.cursor, opts.offset) ?? 0;
+      const { rows: collected, hasMore } = collectPagedRows((cursor, pageLimit) => {
+        const page = listMemoryHistoryPage({ limit: pageLimit, offset: cursor });
+        return {
+          rows: page.rows,
+          has_more: page.has_more,
+          next_cursor: page.next_cursor
+        };
+      }, limit, offset);
+      const memories = hasMore && limit !== undefined ? collected.slice(0, limit) : collected;
       if (globalOpts.json) {
-        outputJson(fetched);
+        outputJson(memories);
         return;
       }
       if (memories.length === 0) {
@@ -65337,7 +65761,7 @@ function registerHistoryCommand(program2) {
       }
       printPageHint({
         shown: memories.length,
-        limit,
+        limit: limit ?? memories.length,
         offset,
         hasMore,
         command: "mementos history",
@@ -65529,10 +65953,9 @@ function registerExportCommand(program2) {
         scope: opts.scope,
         category: opts.category,
         agent_id: agentId,
-        project_id: projectId,
-        limit: 1e4
+        project_id: projectId
       };
-      const memories = listMemories(filter);
+      const memories = listMemoriesBounded(filter, 1e4).rows;
       outputJson(memories);
     } catch (e) {
       handleError(e);
@@ -65545,7 +65968,7 @@ init_memories();
 init_helpers();
 import chalk18 from "chalk";
 import { resolve as resolve12 } from "path";
-import { readFileSync as readFileSync4 } from "fs";
+import { readFileSync as readFileSync5 } from "fs";
 function registerImportCommand(program2) {
   const handleError = makeHandleError(program2);
   program2.command("import [file]").description("Import memories from a JSON file or stdin (use '-' or pipe data)").option("--overwrite", "Overwrite existing memories (default: merge)").action(async (file, opts) => {
@@ -65555,7 +65978,7 @@ function registerImportCommand(program2) {
       if (file === "-" || !file && !process.stdin.isTTY) {
         raw = await Bun.stdin.text();
       } else if (file) {
-        raw = readFileSync4(resolve12(file), "utf-8");
+        raw = readFileSync5(resolve12(file), "utf-8");
       } else {
         console.error(chalk18.red("No input: provide a file path, use '-' for stdin, or pipe data."));
         process.exit(1);
@@ -65585,14 +66008,14 @@ function registerImportCommand(program2) {
 import chalk19 from "chalk";
 
 // src/lib/config.ts
-import { existsSync as existsSync4, mkdirSync as mkdirSync3, readFileSync as readFileSync5, readdirSync, writeFileSync as writeFileSync3, unlinkSync as unlinkSync2, cpSync as cpSync2 } from "fs";
-import { homedir as homedir3 } from "os";
-import { basename, dirname as dirname4, join as join7, resolve as resolve13 } from "path";
+import { existsSync as existsSync5, mkdirSync as mkdirSync3, readFileSync as readFileSync6, readdirSync, writeFileSync as writeFileSync3, unlinkSync as unlinkSync2, cpSync as cpSync2 } from "fs";
+import { homedir as homedir4 } from "os";
+import { basename, dirname as dirname4, join as join8, resolve as resolve13 } from "path";
 function isInMemoryDb2(path) {
   return path === ":memory:" || path.startsWith("file::memory:");
 }
 function homeDir() {
-  return process.env["HOME"] || process.env["USERPROFILE"] || homedir3();
+  return process.env["HOME"] || process.env["USERPROFILE"] || homedir4();
 }
 var DEFAULT_CONFIG = {
   default_scope: "private",
@@ -65650,11 +66073,11 @@ function isValidCategory(value) {
   return VALID_CATEGORIES2.includes(value);
 }
 function loadConfig() {
-  const configPath = join7(homeDir(), ".hasna", "mementos", "config.json");
+  const configPath = join8(homeDir(), ".hasna", "mementos", "config.json");
   let fileConfig = {};
-  if (existsSync4(configPath)) {
+  if (existsSync5(configPath)) {
     try {
-      const raw = readFileSync5(configPath, "utf-8");
+      const raw = readFileSync6(configPath, "utf-8");
       fileConfig = JSON.parse(raw);
     } catch {}
   }
@@ -65680,8 +66103,8 @@ function findFileWalkingUp(filename) {
   let dir = process.cwd();
   const legacyHomeMementosDb = resolve13(homeDir(), ".mementos", "mementos.db");
   while (true) {
-    const candidate = join7(dir, filename);
-    if (existsSync4(candidate) && resolve13(candidate) !== legacyHomeMementosDb) {
+    const candidate = join8(dir, filename);
+    if (existsSync5(candidate) && resolve13(candidate) !== legacyHomeMementosDb) {
       return candidate;
     }
     const parent = dirname4(dir);
@@ -65694,7 +66117,7 @@ function findFileWalkingUp(filename) {
 function findGitRoot2() {
   let dir = process.cwd();
   while (true) {
-    if (existsSync4(join7(dir, ".git"))) {
+    if (existsSync5(join8(dir, ".git"))) {
       return dir;
     }
     const parent = dirname4(dir);
@@ -65705,27 +66128,27 @@ function findGitRoot2() {
   }
 }
 function profilesDir() {
-  return join7(homeDir(), ".hasna", "mementos", "profiles");
+  return join8(homeDir(), ".hasna", "mementos", "profiles");
 }
 function globalConfigPath() {
-  return join7(homeDir(), ".hasna", "mementos", "config.json");
+  return join8(homeDir(), ".hasna", "mementos", "config.json");
 }
 function readGlobalConfig() {
   const p = globalConfigPath();
-  if (!existsSync4(p))
+  if (!existsSync5(p))
     return {};
   try {
-    return JSON.parse(readFileSync5(p, "utf-8"));
+    return JSON.parse(readFileSync6(p, "utf-8"));
   } catch {
     return {};
   }
 }
 function readGlobalConfigForWrite() {
   const p = globalConfigPath();
-  if (!existsSync4(p))
+  if (!existsSync5(p))
     return {};
   try {
-    const data = JSON.parse(readFileSync5(p, "utf-8"));
+    const data = JSON.parse(readFileSync6(p, "utf-8"));
     if (data === null || typeof data !== "object" || Array.isArray(data)) {
       throw new Error("expected a JSON object");
     }
@@ -65758,13 +66181,13 @@ function setActiveProfile(name) {
 }
 function listProfiles() {
   const dir = profilesDir();
-  if (!existsSync4(dir))
+  if (!existsSync5(dir))
     return [];
   return readdirSync(dir).filter((f) => f.endsWith(".db")).map((f) => basename(f, ".db")).sort();
 }
 function deleteProfile(name) {
-  const dbPath = join7(profilesDir(), `${name}.db`);
-  if (!existsSync4(dbPath))
+  const dbPath = join8(profilesDir(), `${name}.db`);
+  if (!existsSync5(dbPath))
     return false;
   unlinkSync2(dbPath);
   if (getActiveProfile() === name)
@@ -65773,10 +66196,10 @@ function deleteProfile(name) {
 }
 function getDbPath2() {
   const _home = homeDir();
-  const _newDir = join7(_home, ".hasna", "mementos");
-  const _oldDir = join7(_home, ".mementos");
-  if (!existsSync4(_newDir) && existsSync4(_oldDir)) {
-    mkdirSync3(join7(_home, ".hasna"), { recursive: true });
+  const _newDir = join8(_home, ".hasna", "mementos");
+  const _oldDir = join8(_home, ".mementos");
+  if (!existsSync5(_newDir) && existsSync5(_oldDir)) {
+    mkdirSync3(join8(_home, ".hasna"), { recursive: true });
     cpSync2(_oldDir, _newDir, { recursive: true });
   }
   const envDbPath = process.env["HASNA_MEMENTOS_DB_PATH"] ?? process.env["MEMENTOS_DB_PATH"];
@@ -65790,7 +66213,7 @@ function getDbPath2() {
   }
   const profile = getActiveProfile();
   if (profile) {
-    const profilePath = join7(profilesDir(), `${profile}.db`);
+    const profilePath = join8(profilesDir(), `${profile}.db`);
     ensureDir2(dirname4(profilePath));
     return profilePath;
   }
@@ -65798,21 +66221,21 @@ function getDbPath2() {
   if (dbScope === "project") {
     const gitRoot = findGitRoot2();
     if (gitRoot) {
-      const dbPath = join7(gitRoot, ".mementos", "mementos.db");
+      const dbPath = join8(gitRoot, ".mementos", "mementos.db");
       ensureDir2(dirname4(dbPath));
       return dbPath;
     }
   }
-  const found = findFileWalkingUp(join7(".mementos", "mementos.db"));
+  const found = findFileWalkingUp(join8(".mementos", "mementos.db"));
   if (found) {
     return found;
   }
-  const fallback = join7(homeDir(), ".hasna", "mementos", "mementos.db");
+  const fallback = join8(homeDir(), ".hasna", "mementos", "mementos.db");
   ensureDir2(dirname4(fallback));
   return fallback;
 }
 function ensureDir2(dir) {
-  if (!existsSync4(dir)) {
+  if (!existsSync5(dir)) {
     mkdirSync3(dir, { recursive: true });
   }
 }
@@ -65930,7 +66353,7 @@ init_database();
 init_helpers();
 import chalk20 from "chalk";
 import { resolve as resolve14, dirname as dirname5 } from "path";
-import { existsSync as existsSync5, statSync, copyFileSync, mkdirSync as mkdirSync4, readdirSync as readdirSync2 } from "fs";
+import { existsSync as existsSync6, statSync, copyFileSync, mkdirSync as mkdirSync4, readdirSync as readdirSync2 } from "fs";
 function registerBackupCommand(program2) {
   const handleError = makeHandleError(program2);
   program2.command("backup [path]").description("Backup the SQLite database to a file").option("--list", "List available backups in ~/.hasna/mementos/backups/").action((targetPath, opts) => {
@@ -65939,7 +66362,7 @@ function registerBackupCommand(program2) {
       const home = process.env["HOME"] || process.env["USERPROFILE"] || "~";
       const backupsDir = resolve14(home, ".hasna", "mementos", "backups");
       if (opts.list) {
-        if (!existsSync5(backupsDir)) {
+        if (!existsSync6(backupsDir)) {
           if (globalOpts.json) {
             outputJson({ backups: [] });
             return;
@@ -65981,7 +66404,7 @@ function registerBackupCommand(program2) {
         return;
       }
       const dbPath = getDbPath();
-      if (!existsSync5(dbPath)) {
+      if (!existsSync6(dbPath)) {
         console.error(chalk20.red(`Database not found at ${dbPath}`));
         process.exit(1);
       }
@@ -65989,7 +66412,7 @@ function registerBackupCommand(program2) {
       if (targetPath) {
         dest = resolve14(targetPath);
       } else {
-        if (!existsSync5(backupsDir)) {
+        if (!existsSync6(backupsDir)) {
           mkdirSync4(backupsDir, { recursive: true });
         }
         const now3 = new Date;
@@ -65997,7 +66420,7 @@ function registerBackupCommand(program2) {
         dest = resolve14(backupsDir, `mementos-${ts}.db`);
       }
       const destDir = dirname5(dest);
-      if (!existsSync5(destDir)) {
+      if (!existsSync6(destDir)) {
         mkdirSync4(destDir, { recursive: true });
       }
       copyFileSync(dbPath, dest);
@@ -66018,29 +66441,31 @@ function registerBackupCommand(program2) {
 // src/cli/commands/io-restore.ts
 init_database();
 init_api_mode();
+init_memories();
 init_helpers();
 import chalk21 from "chalk";
 import { resolve as resolve15 } from "path";
-import { existsSync as existsSync6, statSync as statSync2, copyFileSync as copyFileSync2, readdirSync as readdirSync3 } from "fs";
+import { existsSync as existsSync7, statSync as statSync2, copyFileSync as copyFileSync2, readdirSync as readdirSync3 } from "fs";
+function readMemoriesFromBackup(source) {
+  const { Database: Database3 } = __require("bun:sqlite");
+  const backupDb = new Database3(source, { readonly: true });
+  try {
+    const rows = backupDb.query("SELECT * FROM memories").all();
+    return { rows, count: rows.length };
+  } finally {
+    backupDb.close();
+  }
+}
 function registerRestoreCommand(program2) {
   const handleError = makeHandleError(program2);
   program2.command("restore [file]").description("Restore the database from a backup file").option("--latest", "Restore the most recent backup from ~/.hasna/mementos/backups/").option("--force", "Skip confirmation and perform the restore").action((filePath, opts) => {
     try {
       const globalOpts = program2.opts();
-      if (isApiMode()) {
-        const msg = "restore operates on the local SQLite database and is not available in API mode (the self-hosted cloud store is authoritative). Unset HASNA_MEMENTOS_API_URL / HASNA_MEMENTOS_API_KEY to restore a local db.";
-        if (globalOpts.json) {
-          outputJson({ error: msg });
-        } else {
-          console.error(chalk21.red(msg));
-        }
-        process.exit(1);
-      }
       const home = process.env["HOME"] || process.env["USERPROFILE"] || "~";
       const backupsDir = resolve15(home, ".hasna", "mementos", "backups");
       let source;
       if (opts.latest) {
-        if (!existsSync6(backupsDir)) {
+        if (!existsSync7(backupsDir)) {
           console.error(chalk21.red("No backups directory found."));
           process.exit(1);
         }
@@ -66060,16 +66485,82 @@ function registerRestoreCommand(program2) {
         console.error(chalk21.red("Provide a backup file path or use --latest"));
         process.exit(1);
       }
-      if (!existsSync6(source)) {
+      if (!existsSync7(source)) {
         console.error(chalk21.red(`Backup file not found: ${source}`));
         process.exit(1);
       }
-      const dbPath = getDbPath();
       const backupStat = statSync2(source);
       const backupSizeMB = (backupStat.size / (1024 * 1024)).toFixed(1);
       const backupSizeStr = backupStat.size >= 1024 * 1024 ? `${backupSizeMB} MB` : `${(backupStat.size / 1024).toFixed(1)} KB`;
+      if (isApiMode()) {
+        const { rows, count } = readMemoriesFromBackup(source);
+        if (!opts.force) {
+          if (globalOpts.json) {
+            outputJson({
+              action: "restore",
+              source,
+              target: "cloud-api",
+              backup_size: backupStat.size,
+              backup_memories: count,
+              status: "dry_run",
+              message: "Restores the backup's memories into the hosted store; existing store rows are never overwritten. Use --force to confirm."
+            });
+            return;
+          }
+          console.log(chalk21.bold("Restore preview (hosted store):"));
+          console.log(`  Source:           ${chalk21.cyan(source)} (${backupSizeStr})`);
+          console.log(`  Backup memories:  ${chalk21.green(String(count))}`);
+          console.log(`  Target:           hosted store (cloud-api)`);
+          console.log(`  Semantics:        merges the backup's memories; existing rows are never overwritten`);
+          console.log();
+          console.log(chalk21.yellow("Use --force to confirm restore"));
+          return;
+        }
+        const result = bulkUpsertMemories(rows);
+        if (result.rejected > 0) {
+          const msg = `${result.rejected} of ${result.total} memories were rejected and did not persist. See errors.`;
+          if (globalOpts.json) {
+            outputJson({
+              action: "restore",
+              status: "failed",
+              source,
+              target: "cloud-api",
+              inserted: result.inserted,
+              skipped: result.skipped,
+              rejected: result.rejected,
+              total: result.total,
+              error: msg
+            });
+          } else {
+            console.error(chalk21.red(msg));
+          }
+          process.exit(1);
+        }
+        if (globalOpts.json) {
+          outputJson({
+            action: "restore",
+            source,
+            target: "cloud-api",
+            backup_size: backupStat.size,
+            backup_memories: count,
+            restored_memories: result.inserted,
+            inserted: result.inserted,
+            skipped: result.skipped,
+            rejected: result.rejected,
+            total: result.total,
+            status: "completed"
+          });
+          return;
+        }
+        console.log(`Restored from: ${chalk21.green(source)}`);
+        console.log(`  Restored memories: ${chalk21.green(String(result.inserted))} (inserted)`);
+        console.log(`  Skipped (already present): ${chalk21.yellow(String(result.skipped))}`);
+        console.log(`  Rejected: ${chalk21.yellow(String(result.rejected))}`);
+        return;
+      }
+      const dbPath = getDbPath();
       let currentCount = 0;
-      if (existsSync6(dbPath)) {
+      if (existsSync7(dbPath)) {
         try {
           const db = getDatabase();
           const row = db.query("SELECT COUNT(*) as count FROM memories").get();
@@ -67323,11 +67814,11 @@ init_memories();
 init_agents();
 init_projects();
 import chalk27 from "chalk";
-import { join as join8 } from "path";
-import { homedir as homedir4 } from "os";
+import { join as join9 } from "path";
+import { homedir as homedir5 } from "os";
 import {
-  readFileSync as readFileSync6,
-  existsSync as existsSync7,
+  readFileSync as readFileSync7,
+  existsSync as existsSync8,
   accessSync,
   statSync as statSync3,
   constants as fsConstants
@@ -67362,7 +67853,7 @@ function registerDoctorCommand(program2) {
     checks.push({ name: "Version", status: "ok", detail: version });
     const dbPath = getDbPath();
     let db = null;
-    if (dbPath !== ":memory:" && existsSync7(dbPath)) {
+    if (dbPath !== ":memory:" && existsSync8(dbPath)) {
       try {
         accessSync(dbPath, fsConstants.R_OK | fsConstants.W_OK);
         checks.push({ name: "Database file", status: "ok", detail: dbPath });
@@ -67381,7 +67872,7 @@ function registerDoctorCommand(program2) {
       checks.push({ name: "Database connection", status: "fail", detail: e instanceof Error ? e.message : String(e) });
     }
     try {
-      if (dbPath !== ":memory:" && existsSync7(dbPath)) {
+      if (dbPath !== ":memory:" && existsSync8(dbPath)) {
         const stats = statSync3(dbPath);
         const sizeKb = (stats.size / 1024).toFixed(1);
         const sizeMb = (stats.size / (1024 * 1024)).toFixed(2);
@@ -67514,9 +68005,9 @@ function registerDoctorCommand(program2) {
       checks.push({ name: "MCP server", status: "warn", detail: "could not check (is claude CLI installed?)" });
     }
     try {
-      const settingsFilePath = join8(homedir4(), ".claude", "settings.json");
-      if (existsSync7(settingsFilePath)) {
-        const settings = JSON.parse(readFileSync6(settingsFilePath, "utf-8"));
+      const settingsFilePath = join9(homedir5(), ".claude", "settings.json");
+      if (existsSync8(settingsFilePath)) {
+        const settings = JSON.parse(readFileSync7(settingsFilePath, "utf-8"));
         const hooksObj = settings["hooks"] || {};
         const stopHooks = hooksObj["Stop"] || [];
         const hasMementos = stopHooks.some((e) => e.hooks?.some((h) => h.command && h.command.includes("mementos")));
@@ -67532,11 +68023,11 @@ function registerDoctorCommand(program2) {
       checks.push({ name: "Stop hook", status: "warn", detail: "could not check stop hook" });
     }
     if (process.platform === "darwin") {
-      const plistFilePath = join8(homedir4(), "Library", "LaunchAgents", "com.hasna.mementos.plist");
+      const plistFilePath = join9(homedir5(), "Library", "LaunchAgents", "com.hasna.mementos.plist");
       checks.push({
         name: "Auto-start",
-        status: existsSync7(plistFilePath) ? "ok" : "warn",
-        detail: existsSync7(plistFilePath) ? "configured (starts on login)" : "not configured  \u2192  run: mementos init"
+        status: existsSync8(plistFilePath) ? "ok" : "warn",
+        detail: existsSync8(plistFilePath) ? "configured (starts on login)" : "not configured  \u2192  run: mementos init"
       });
     } else {
       checks.push({ name: "Auto-start", status: "ok", detail: `n/a on ${process.platform}` });
@@ -67615,9 +68106,9 @@ async function runCloudDoctor(globalOpts, checks) {
     checks.push({ name: "MCP server", status: "warn", detail: "could not check (is claude CLI installed?)" });
   }
   try {
-    const settingsFilePath = join8(homedir4(), ".claude", "settings.json");
-    if (existsSync7(settingsFilePath)) {
-      const settings = JSON.parse(readFileSync6(settingsFilePath, "utf-8"));
+    const settingsFilePath = join9(homedir5(), ".claude", "settings.json");
+    if (existsSync8(settingsFilePath)) {
+      const settings = JSON.parse(readFileSync7(settingsFilePath, "utf-8"));
       const hooksObj = settings["hooks"] || {};
       const stopHooks = hooksObj["Stop"] || [];
       const hasMementos = stopHooks.some((e) => e.hooks?.some((h) => h.command && h.command.includes("mementos")));
@@ -67633,11 +68124,11 @@ async function runCloudDoctor(globalOpts, checks) {
     checks.push({ name: "Stop hook", status: "warn", detail: "could not check stop hook" });
   }
   if (process.platform === "darwin") {
-    const plistFilePath = join8(homedir4(), "Library", "LaunchAgents", "com.hasna.mementos.plist");
+    const plistFilePath = join9(homedir5(), "Library", "LaunchAgents", "com.hasna.mementos.plist");
     checks.push({
       name: "Auto-start",
-      status: existsSync7(plistFilePath) ? "ok" : "warn",
-      detail: existsSync7(plistFilePath) ? "configured (starts on login)" : "not configured  \u2192  run: mementos init"
+      status: existsSync8(plistFilePath) ? "ok" : "warn",
+      detail: existsSync8(plistFilePath) ? "configured (starts on login)" : "not configured  \u2192  run: mementos init"
     });
   } else {
     checks.push({ name: "Auto-start", status: "ok", detail: `n/a on ${process.platform}` });
@@ -69163,6 +69654,7 @@ function syncMemoriesTable(source, target, local, direction, currentMachineId) {
     const countResult = source.get(`SELECT COUNT(*) as cnt FROM "${MEMORY_TABLE}"`);
     stat.total_rows = countResult?.cnt ?? 0;
     const rows = since ? source.all(`SELECT * FROM "${MEMORY_TABLE}" WHERE updated_at > ?`, since) : source.all(`SELECT * FROM "${MEMORY_TABLE}"`);
+    const erroredRowIds = new Set;
     for (const row of rows) {
       try {
         const sourceMachine = sourceMachineRef(row, currentMachineId);
@@ -69221,18 +69713,34 @@ function syncMemoriesTable(source, target, local, direction, currentMachineId) {
         clearMemoryEmbedding(winnerDb, String(winner["id"]));
         stat.synced_rows++;
       } catch (error) {
+        erroredRowIds.add(String(row["id"] ?? "unknown"));
         stat.errors.push(`Memory ${String(row["id"] ?? "unknown")}: ${error instanceof Error ? error.message : String(error)}`);
       }
     }
     if (rows.length === 0) {
       stat.skipped_rows = stat.total_rows;
     }
-    upsertMemorySyncMeta(local, {
-      table_name: MEMORY_TABLE,
-      direction,
-      last_synced_at: new Date().toISOString(),
-      last_synced_row_count: stat.synced_rows
-    });
+    if (rows.length > 0 && stat.errors.length === 0) {
+      let maxSyncedAt = null;
+      for (const row of rows) {
+        if (erroredRowIds.has(String(row["id"] ?? "unknown"))) {
+          continue;
+        }
+        const value = row["updated_at"];
+        if (typeof value === "string" && (maxSyncedAt === null || value > maxSyncedAt)) {
+          maxSyncedAt = value;
+        }
+      }
+      const nextCursor = maxSyncedAt ?? syncMeta?.last_synced_at ?? null;
+      if (nextCursor !== null) {
+        upsertMemorySyncMeta(local, {
+          table_name: MEMORY_TABLE,
+          direction,
+          last_synced_at: nextCursor,
+          last_synced_row_count: stat.synced_rows
+        });
+      }
+    }
   } catch (error) {
     stat.errors.push(error instanceof Error ? error.message : String(error));
   }
@@ -69622,19 +70130,19 @@ function registerStorageCommands(program2) {
 // src/cli/commands/init.ts
 import chalk41 from "chalk";
 import {
-  readFileSync as readFileSync7,
+  readFileSync as readFileSync8,
   writeFileSync as writeFileSync4,
-  existsSync as existsSync9,
+  existsSync as existsSync10,
   copyFileSync as copyFileSync3,
   mkdirSync as mkdirSync6
 } from "fs";
-import { dirname as dirname7, join as join10 } from "path";
-import { homedir as homedir5 } from "os";
+import { dirname as dirname7, join as join11 } from "path";
+import { homedir as homedir6 } from "os";
 import { fileURLToPath as fileURLToPath4 } from "url";
 function registerInitCommand(program2) {
   program2.command("init").description("One-command setup: register MCP, install stop hook, configure auto-start").action(async () => {
     const { platform: platform2 } = process;
-    const home = homedir5();
+    const home = homedir6();
     const isMac = platform2 === "darwin";
     console.log("");
     console.log(chalk41.bold("  mementos \u2014 setting up your memory layer"));
@@ -69689,17 +70197,17 @@ function registerInitCommand(program2) {
     } else {
       console.log(chalk41.green("  \u2713 MCP server registered with Claude Code"));
     }
-    const hooksDir = join10(home, ".claude", "hooks");
-    const hookDest = join10(hooksDir, "mementos-stop-hook.ts");
-    const settingsPath = join10(home, ".claude", "settings.json");
+    const hooksDir = join11(home, ".claude", "hooks");
+    const hookDest = join11(hooksDir, "mementos-stop-hook.ts");
+    const settingsPath = join11(home, ".claude", "settings.json");
     const hookCommand = `bun ${hookDest}`;
     let hookAlreadyInstalled = false;
     let hookError = null;
     try {
       let settings = {};
-      if (existsSync9(settingsPath)) {
+      if (existsSync10(settingsPath)) {
         try {
-          settings = JSON.parse(readFileSync7(settingsPath, "utf-8"));
+          settings = JSON.parse(readFileSync8(settingsPath, "utf-8"));
         } catch {
           settings = {};
         }
@@ -69710,19 +70218,19 @@ function registerInitCommand(program2) {
       if (alreadyHasMementos) {
         hookAlreadyInstalled = true;
       } else {
-        if (!existsSync9(hooksDir)) {
+        if (!existsSync10(hooksDir)) {
           mkdirSync6(hooksDir, { recursive: true });
         }
-        if (!existsSync9(hookDest)) {
+        if (!existsSync10(hookDest)) {
           const packageDir = dirname7(dirname7(fileURLToPath4(import.meta.url)));
           const candidatePaths = [
-            join10(packageDir, "scripts", "hooks", "claude-stop-hook.ts"),
-            join10(packageDir, "..", "scripts", "hooks", "claude-stop-hook.ts"),
-            join10(home, ".bun", "install", "global", "node_modules", "@hasna", "mementos", "scripts", "hooks", "claude-stop-hook.ts")
+            join11(packageDir, "scripts", "hooks", "claude-stop-hook.ts"),
+            join11(packageDir, "..", "scripts", "hooks", "claude-stop-hook.ts"),
+            join11(home, ".bun", "install", "global", "node_modules", "@hasna", "mementos", "scripts", "hooks", "claude-stop-hook.ts")
           ];
           let hookSourceFound = false;
           for (const src of candidatePaths) {
-            if (existsSync9(src)) {
+            if (existsSync10(src)) {
               copyFileSync3(src, hookDest);
               hookSourceFound = true;
               break;
@@ -69788,7 +70296,7 @@ main().catch(() => {});
     if (!isMac) {
       console.log(chalk41.dim(`  \xB7 Auto-start skipped (not macOS \u2014 platform: ${platform2})`));
     } else {
-      const plistPath = join10(home, "Library", "LaunchAgents", "com.hasna.mementos.plist");
+      const plistPath = join11(home, "Library", "LaunchAgents", "com.hasna.mementos.plist");
       const plistContent = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -69813,11 +70321,11 @@ main().catch(() => {});
 </plist>
 `;
       try {
-        if (existsSync9(plistPath)) {
+        if (existsSync10(plistPath)) {
           autoStartAlreadyInstalled = true;
         } else {
-          const launchAgentsDir = join10(home, "Library", "LaunchAgents");
-          if (!existsSync9(launchAgentsDir)) {
+          const launchAgentsDir = join11(home, "Library", "LaunchAgents");
+          if (!existsSync10(launchAgentsDir)) {
             mkdirSync6(launchAgentsDir, { recursive: true });
           }
           writeFileSync4(plistPath, plistContent, "utf-8");
@@ -69833,7 +70341,7 @@ main().catch(() => {});
         console.log(chalk41.green("  \u2713 Auto-start configured (starts on login)"));
       }
       if (!autoStartAlreadyInstalled && !autoStartError) {
-        const plistPath2 = join10(home, "Library", "LaunchAgents", "com.hasna.mementos.plist");
+        const plistPath2 = join11(home, "Library", "LaunchAgents", "com.hasna.mementos.plist");
         const loadResult = await run(["launchctl", "load", plistPath2]);
         if (!loadResult.ok) {
           console.log(chalk41.dim(`  \xB7 launchctl load: ${loadResult.output || "already loaded"}`));
@@ -70947,13 +71455,13 @@ function lessonTagForCli(kind) {
 
 // src/cli/brains.ts
 import {
-  existsSync as existsSync11,
+  existsSync as existsSync12,
   mkdirSync as mkdirSync8,
   writeFileSync as writeFileSync6,
   readdirSync as readdirSync4
 } from "fs";
-import { homedir as homedir7 } from "os";
-import { join as join12 } from "path";
+import { homedir as homedir8 } from "os";
+import { join as join13 } from "path";
 import chalk43 from "chalk";
 
 // src/lib/gatherer.ts
@@ -71008,7 +71516,7 @@ ${matched.map((m) => `- ${m.key}: ${m.value.slice(0, 120)}${m.value.length > 120
   };
 }
 var gatherTrainingData = async (options = {}) => {
-  const allMemories = listMemories({ status: "active" });
+  const allMemories = listMemoriesBounded({ status: "active" }, undefined).rows;
   const filtered = options.since ? allMemories.filter((m) => new Date(m.created_at) >= options.since) : allMemories;
   const sorted = filtered.slice().sort((a, b) => b.importance - a.importance);
   const fetchSet = options.limit ? sorted.slice(0, options.limit * 3) : sorted;
@@ -71030,24 +71538,24 @@ var gatherTrainingData = async (options = {}) => {
 };
 
 // src/lib/model-config.ts
-import { existsSync as existsSync10, mkdirSync as mkdirSync7, readFileSync as readFileSync8, writeFileSync as writeFileSync5 } from "fs";
-import { homedir as homedir6 } from "os";
-import { join as join11 } from "path";
+import { existsSync as existsSync11, mkdirSync as mkdirSync7, readFileSync as readFileSync9, writeFileSync as writeFileSync5 } from "fs";
+import { homedir as homedir7 } from "os";
+import { join as join12 } from "path";
 var DEFAULT_MODEL = "gpt-4o-mini";
-var CONFIG_DIR = join11(homedir6(), ".hasna", "mementos");
-var CONFIG_PATH = join11(CONFIG_DIR, "config.json");
+var CONFIG_DIR = join12(homedir7(), ".hasna", "mementos");
+var CONFIG_PATH = join12(CONFIG_DIR, "config.json");
 function readConfig() {
-  if (!existsSync10(CONFIG_PATH))
+  if (!existsSync11(CONFIG_PATH))
     return {};
   try {
-    const raw = readFileSync8(CONFIG_PATH, "utf-8");
+    const raw = readFileSync9(CONFIG_PATH, "utf-8");
     return JSON.parse(raw);
   } catch {
     return {};
   }
 }
 function writeConfig(config2) {
-  if (!existsSync10(CONFIG_DIR)) {
+  if (!existsSync11(CONFIG_DIR)) {
     mkdirSync7(CONFIG_DIR, { recursive: true });
   }
   writeFileSync5(CONFIG_PATH, JSON.stringify(config2, null, 2) + `
@@ -71095,12 +71603,12 @@ function makeBrainsCommand() {
         limit: opts.limit,
         since
       });
-      const outputDir = opts.output ?? join12(homedir7(), ".hasna", "mementos", "training");
-      if (!existsSync11(outputDir)) {
+      const outputDir = opts.output ?? join13(homedir8(), ".hasna", "mementos", "training");
+      if (!existsSync12(outputDir)) {
         mkdirSync8(outputDir, { recursive: true });
       }
       const timestamp2 = new Date().toISOString().replace(/[:.]/g, "-").slice(0, 19);
-      const outputPath = join12(outputDir, `mementos-training-${timestamp2}.jsonl`);
+      const outputPath = join13(outputDir, `mementos-training-${timestamp2}.jsonl`);
       const jsonl = result.examples.map((ex) => JSON.stringify(ex)).join(`
 `);
       writeFileSync6(outputPath, jsonl + `
@@ -71124,8 +71632,8 @@ function makeBrainsCommand() {
     try {
       let datasetPath = opts.dataset;
       if (!datasetPath) {
-        const trainingDir = join12(homedir7(), ".hasna", "mementos", "training");
-        if (!existsSync11(trainingDir)) {
+        const trainingDir = join13(homedir8(), ".hasna", "mementos", "training");
+        if (!existsSync12(trainingDir)) {
           printError("No training data found. Run `mementos brains gather` first.");
           process.exit(1);
         }
@@ -71135,9 +71643,9 @@ function makeBrainsCommand() {
           printError("No JSONL training files found. Run `mementos brains gather` first.");
           process.exit(1);
         }
-        datasetPath = join12(trainingDir, latestFile);
+        datasetPath = join13(trainingDir, latestFile);
       }
-      if (!datasetPath || !existsSync11(datasetPath)) {
+      if (!datasetPath || !existsSync12(datasetPath)) {
         printError(`Dataset file not found: ${datasetPath ?? "(unresolved)"}`);
         process.exit(1);
       }
@@ -71263,8 +71771,8 @@ function registerAllCommands(program2) {
 // src/cli/index.tsx
 function getPackageVersion2() {
   try {
-    const pkgPath = join13(dirname8(fileURLToPath5(import.meta.url)), "..", "..", "package.json");
-    const pkg = JSON.parse(readFileSync9(pkgPath, "utf-8"));
+    const pkgPath = join14(dirname8(fileURLToPath5(import.meta.url)), "..", "..", "package.json");
+    const pkg = JSON.parse(readFileSync10(pkgPath, "utf-8"));
     return pkg.version || "0.0.0";
   } catch {
     return "0.0.0";