chainlesschain 0.162.149 → 0.162.150

package/src/lib/pqc-manager.js

@@ -178,6 +178,70 @@ export function ensurePQCTables(db) {
   `);
 }
 
+/**
+ * Rehydrate _keys/_migrations from the persisted pqc_keys/pqc_migration_status
+ * tables. The `cc` CLI runs every command in a fresh process, so without this
+ * the Maps start empty and a key generated / migration run in a prior
+ * invocation is invisible (`cc pqc keys` reports "No PQC keys" and `cc pqc
+ * migration-status` is empty even when the rows exist; `cc pqc migrate` counts
+ * sourceKeys off the empty Map and reports "Migrated 0/0" while real keys sit
+ * unmigrated). Call after ensurePQCTables(db). NOTE: this module holds only
+ * public-key inventory metadata — there is no private key or sign/verify path
+ * here — so the impact is inventory visibility + migration accounting, not
+ * crypto verification.
+ */
+export function loadFromDb(db) {
+  if (!db) return 0;
+  _keys.clear();
+  _migrations.clear();
+
+  const keyRows = db.prepare(`SELECT * FROM pqc_keys`).all();
+  for (const row of keyRows) {
+    let metadata = {};
+    try {
+      metadata = row.metadata ? JSON.parse(row.metadata) : {};
+    } catch {
+      metadata = {};
+    }
+    // Derived fields (family/publicKeyBytes/signatureBytes) come from the
+    // algorithm spec, not the DB — reconstruct them exactly as generateKey does.
+    const spec = ALGORITHM_SPECS[row.algorithm] || {};
+    _keys.set(row.id, {
+      id: row.id,
+      algorithm: row.algorithm,
+      family: spec.family ?? null,
+      purpose: row.purpose,
+      publicKey: row.public_key,
+      keySize: row.key_size ?? spec.keySize ?? 0,
+      publicKeyBytes: spec.publicKeyBytes ?? null,
+      signatureBytes: spec.signatureBytes ?? null,
+      hybridMode: !!row.hybrid_mode,
+      classicalAlgorithm: row.classical_algorithm ?? null,
+      status: row.status,
+      metadata,
+      createdAt: row.created_at ?? null,
+    });
+  }
+
+  const migRows = db.prepare(`SELECT * FROM pqc_migration_status`).all();
+  for (const row of migRows) {
+    _migrations.set(row.id, {
+      id: row.id,
+      planName: row.plan_name,
+      sourceAlgorithm: row.source_algorithm,
+      targetAlgorithm: row.target_algorithm,
+      totalKeys: row.total_keys ?? 0,
+      migratedKeys: row.migrated_keys ?? 0,
+      status: row.status,
+      startedAt: row.started_at ?? null,
+      completedAt: row.completed_at ?? null,
+      errorMessage: row.error_message ?? null,
+    });
+  }
+
+  return _keys.size + _migrations.size;
+}
+
 /* ── Key Management ───────────────────────────────────────── */
 
 export function listKeys(filter = {}) {

package/src/lib/reputation-optimizer.js

@@ -509,6 +509,107 @@ export function _resetState() {
   _maxConcurrentOptimizations = DEFAULT_MAX_CONCURRENT_OPTIMIZATIONS;
 }
 
+/**
+ * Rehydrate the in-memory Maps from the persisted reputation_* tables. The CLI
+ * runs each `cc reputation` subcommand in a fresh node process, so
+ * _observations/_runs/_analytics start empty every invocation. Every write
+ * dual-writes (Map + INSERT into reputation_observations/
+ * reputation_optimization_runs/reputation_analytics) but every read
+ * (computeScore/listScores/detectAnomalies/getOptimizationStatus/getAnalytics/
+ * listOptimizationRuns/applyOptimizedParams + the V2 drivers) is Map-only and
+ * nothing SELECTed the tables back — so observed scores read back as 0, `list`/
+ * `runs`/`anomalies` were always empty, and `status`/`complete`/`apply <runId>`
+ * threw "Optimization run not found" for a run that genuinely exists on disk.
+ * Call after ensureReputationTables(db).
+ *
+ * Non-persisted fields default safely: run.history=[] (V1), errorMessage=null.
+ */
+export function loadFromDb(db) {
+  if (!db) return 0;
+  ensureReputationTables(db);
+  _observations.clear();
+  _runs.clear();
+  _analytics.clear();
+
+  for (const r of db
+    .prepare(
+      `SELECT observation_id, did, score, kind, weight, recorded_at
+         FROM reputation_observations ORDER BY recorded_at ASC`,
+    )
+    .all()) {
+    if (!_observations.has(r.did)) _observations.set(r.did, []);
+    _observations.get(r.did).push({
+      observationId: r.observation_id,
+      did: r.did,
+      score: Number(r.score),
+      kind: r.kind,
+      weight: Number(r.weight),
+      recordedAt: Number(r.recorded_at),
+    });
+  }
+
+  for (const r of db
+    .prepare(
+      `SELECT run_id, objective, iterations, param_space, best_params, best_score,
+              status, created_at, completed_at
+         FROM reputation_optimization_runs ORDER BY created_at ASC`,
+    )
+    .all()) {
+    // One corrupt param/params cell must not sink the whole run list.
+    let paramSpace = {};
+    let bestParams = null;
+    try {
+      paramSpace = r.param_space ? JSON.parse(r.param_space) : {};
+    } catch {
+      paramSpace = {};
+    }
+    try {
+      bestParams = r.best_params ? JSON.parse(r.best_params) : null;
+    } catch {
+      bestParams = null;
+    }
+    _runs.set(r.run_id, {
+      runId: r.run_id,
+      objective: r.objective,
+      iterations: Number(r.iterations),
+      paramSpace,
+      bestParams,
+      bestScore: r.best_score == null ? null : Number(r.best_score),
+      errorMessage: null,
+      status: r.status,
+      createdAt: Number(r.created_at),
+      completedAt: r.completed_at == null ? null : Number(r.completed_at),
+      history: [],
+      _seq: ++_seq,
+    });
+  }
+
+  for (const r of db
+    .prepare(
+      `SELECT analytics_id, run_id, reputation_distribution, anomalies, recommendations, created_at
+         FROM reputation_analytics ORDER BY created_at ASC`,
+    )
+    .all()) {
+    const parse = (v, fallback) => {
+      try {
+        return v ? JSON.parse(v) : fallback;
+      } catch {
+        return fallback;
+      }
+    };
+    _analytics.set(r.run_id, {
+      analyticsId: r.analytics_id,
+      runId: r.run_id,
+      reputationDistribution: parse(r.reputation_distribution, {}),
+      anomalies: parse(r.anomalies, []),
+      recommendations: parse(r.recommendations, []),
+      createdAt: Number(r.created_at),
+    });
+  }
+
+  return _observations.size + _runs.size + _analytics.size;
+}
+
 /* ═══════════════════════════════════════════════════════════════
  * V2 (Phase 60) — Frozen enums + async optimization lifecycle +
  * concurrency limiter + patch-merged setRunStatus + stats-v2.

package/src/lib/sandbox-egress-proxy.js

@@ -17,7 +17,60 @@
 
 import http from "node:http";
 import net from "node:net";
-import { evaluateNetworkAccess } from "./sandbox-network-policy.js";
+import dns from "node:dns";
+import {
+  evaluateNetworkAccess,
+  isPrivateHost,
+} from "./sandbox-network-policy.js";
+
+/** Promisified `dns.lookup` returning ALL resolved addresses. */
+function defaultLookup(host) {
+  return new Promise((resolve, reject) => {
+    dns.lookup(host, { all: true }, (err, addrs) =>
+      err ? reject(err) : resolve(addrs),
+    );
+  });
+}
+
+/**
+ * DNS-rebinding / SSRF-by-resolution guard. The domain policy is decided by
+ * NAME, but a public-looking name can RESOLVE to a private / metadata IP
+ * (`rebind.evil.com → 127.0.0.1` / `169.254.169.254`) and the name check would
+ * never see it — a classic rebinding bypass (Phase 1 acceptance "DNS 重绑定有
+ * 安全测试"). After a wildcard/permissive allow, resolve the host and reject if
+ * ANY address is private (unless `allowPrivate`). Fail CLOSED on an unresolvable
+ * host. On success, pin the connection to the exact validated address so a
+ * second resolution at connect time can't rebind to a different (private) IP.
+ * A `specific` allow (exact/subdomain name the user vetted) is exempt — the
+ * caller skips this — so intentional internal-name allowlisting still works.
+ * @returns {Promise<{ok:boolean, ip?:string, reason?:string}>}
+ */
+async function guardResolvedTarget(host, policy, lookup) {
+  let addrs;
+  try {
+    addrs = await lookup(host);
+  } catch (e) {
+    return {
+      ok: false,
+      reason: `unresolvable host (fail-closed): ${e.code || e.message}`,
+    };
+  }
+  const list = Array.isArray(addrs) ? addrs : addrs ? [addrs] : [];
+  if (list.length === 0) {
+    return { ok: false, reason: "host resolved to no addresses (fail-closed)" };
+  }
+  for (const a of list) {
+    const ip = typeof a === "string" ? a : a && a.address;
+    if (ip && isPrivateHost(ip) && !policy.allowPrivate) {
+      return {
+        ok: false,
+        reason: `dns-rebinding: ${host} resolves to private ${ip}`,
+      };
+    }
+  }
+  const first = list[0];
+  return { ok: true, ip: typeof first === "string" ? first : first.address };
+}
 
 /**
  * Build the proxy env vars a child process needs to route through the proxy.
@@ -64,77 +117,124 @@ export function createEgressProxy(policy = {}, opts = {}) {
     return verdict;
   };
 
-  const server = http.createServer((req, res) => {
-    // A forward-proxy request carries the absolute URL in the request line.
-    const verdict = decide(req.url, "http");
-    if (!verdict.allowed) {
-      res.writeHead(403, { "content-type": "text/plain" });
-      res.end(`egress blocked: ${verdict.host} — ${verdict.reason}\n`);
-      return;
+  const lookup = opts.lookup || defaultLookup;
+  const rebindGuard = opts.checkDnsRebinding !== false; // on by default
+
+  // Second gate: after a NAME-based allow, re-check the RESOLVED address for
+  // DNS rebinding (unless the allow was `specific` — a name the user vetted —
+  // or the guard is disabled). Returns the verdict to ACT on plus `ip`, the
+  // exact address to pin the connection to (null → connect by the original
+  // name). When the resolved IP is private the name-based allow is overturned:
+  // fix the counters and re-notify observers with the block reason.
+  const guard = async (verdict, kind) => {
+    if (!verdict.allowed || verdict.specific || !rebindGuard) {
+      return { verdict, ip: null };
     }
-    let u;
+    const res = await guardResolvedTarget(verdict.host, policy, lookup);
+    if (res.ok) return { verdict, ip: res.ip };
+    state.allowed -= 1;
+    state.blocked += 1;
+    const blocked = { allowed: false, host: verdict.host, reason: res.reason };
+    if (typeof opts.onDecision === "function") {
+      try {
+        opts.onDecision({ kind, target: verdict.host, ...blocked });
+      } catch {
+        /* observation is best-effort */
+      }
+    }
+    return { verdict: blocked, ip: null };
+  };
+
+  const server = http.createServer(async (req, res) => {
     try {
-      u = new URL(req.url);
+      // A forward-proxy request carries the absolute URL in the request line.
+      const { verdict, ip } = await guard(decide(req.url, "http"), "http");
+      if (!verdict.allowed) {
+        res.writeHead(403, { "content-type": "text/plain" });
+        res.end(`egress blocked: ${verdict.host} — ${verdict.reason}\n`);
+        return;
+      }
+      let u;
+      try {
+        u = new URL(req.url);
+      } catch {
+        res.writeHead(400, { "content-type": "text/plain" });
+        res.end("bad request target\n");
+        return;
+      }
+      const upstream = http.request(
+        {
+          hostname: ip || u.hostname, // pin to the validated IP when re-checked
+          port: u.port || 80,
+          path: `${u.pathname}${u.search}`,
+          method: req.method,
+          headers: req.headers, // preserves the original Host header
+        },
+        (upRes) => {
+          res.writeHead(upRes.statusCode || 502, upRes.headers);
+          upRes.pipe(res);
+        },
+      );
+      upstream.on("error", () => {
+        if (!res.headersSent)
+          res.writeHead(502, { "content-type": "text/plain" });
+        res.end("upstream error\n");
+      });
+      req.pipe(upstream);
     } catch {
-      res.writeHead(400, { "content-type": "text/plain" });
-      res.end("bad request target\n");
-      return;
-    }
-    const upstream = http.request(
-      {
-        hostname: u.hostname,
-        port: u.port || 80,
-        path: `${u.pathname}${u.search}`,
-        method: req.method,
-        headers: req.headers,
-      },
-      (upRes) => {
-        res.writeHead(upRes.statusCode || 502, upRes.headers);
-        upRes.pipe(res);
-      },
-    );
-    upstream.on("error", () => {
       if (!res.headersSent)
         res.writeHead(502, { "content-type": "text/plain" });
-      res.end("upstream error\n");
-    });
-    req.pipe(upstream);
+      res.end("proxy error\n");
+    }
   });
 
   // HTTPS (and any TLS) goes through CONNECT — tunnel only allowed hosts.
-  server.on("connect", (req, clientSocket, head) => {
-    const verdict = decide(req.url, "connect"); // req.url = "host:port"
-    if (!verdict.allowed) {
-      clientSocket.write(
-        "HTTP/1.1 403 Forbidden\r\n" +
-          "Content-Type: text/plain\r\n\r\n" +
-          `egress blocked: ${verdict.host} — ${verdict.reason}\n`,
-      );
-      clientSocket.end();
-      return;
-    }
-    const [host, portStr] = req.url.split(":");
-    const port = parseInt(portStr, 10) || 443;
-    const upstream = net.connect(port, host, () => {
-      clientSocket.write("HTTP/1.1 200 Connection Established\r\n\r\n");
-      if (head && head.length) upstream.write(head);
-      upstream.pipe(clientSocket);
-      clientSocket.pipe(upstream);
-    });
-    upstream.on("error", () => {
-      try {
+  server.on("connect", async (req, clientSocket, head) => {
+    try {
+      const { verdict, ip } = await guard(
+        decide(req.url, "connect"),
+        "connect",
+      ); // req.url = "host:port"
+      if (!verdict.allowed) {
+        clientSocket.write(
+          "HTTP/1.1 403 Forbidden\r\n" +
+            "Content-Type: text/plain\r\n\r\n" +
+            `egress blocked: ${verdict.host} — ${verdict.reason}\n`,
+        );
         clientSocket.end();
-      } catch {
-        /* already closed */
+        return;
       }
-    });
-    clientSocket.on("error", () => {
+      const [host, portStr] = req.url.split(":");
+      const port = parseInt(portStr, 10) || 443;
+      // Connect to the pinned validated IP so a rebind at connect time can't
+      // swap in a private address between our check and the socket.
+      const upstream = net.connect(port, ip || host, () => {
+        clientSocket.write("HTTP/1.1 200 Connection Established\r\n\r\n");
+        if (head && head.length) upstream.write(head);
+        upstream.pipe(clientSocket);
+        clientSocket.pipe(upstream);
+      });
+      upstream.on("error", () => {
+        try {
+          clientSocket.end();
+        } catch {
+          /* already closed */
+        }
+      });
+      clientSocket.on("error", () => {
+        try {
+          upstream.destroy();
+        } catch {
+          /* already gone */
+        }
+      });
+    } catch {
       try {
-        upstream.destroy();
+        clientSocket.end();
       } catch {
-        /* already gone */
+        /* already closed */
       }
-    });
+    }
   });
 
   return {

package/src/lib/sandbox-fs-policy.js

@@ -0,0 +1,112 @@
+/**
+ * Sandbox filesystem path policy (Phase 1) — decide whether a Shell subprocess
+ * (or the agent's own file tools) may read/write a given path under
+ * `sandbox.filesystem.{allowRead,denyRead,allowWrite,denyWrite}` (here the
+ * legacy `{read, write, denied}` shape). OS-level ENFORCEMENT is platform
+ * specific (bubblewrap `--bind`/`--ro-bind`/`--tmpfs`, seatbelt), but the POLICY
+ * DECISION is pure, shared, and must get the tricky cases right — the twin of
+ * `sandbox-network-policy.js`. The prior check used raw `filePath.startsWith()`,
+ * which let three attacks through:
+ *
+ *   - PATH TRAVERSAL: `/tmp/../etc/passwd` starts with an allowed `/tmp` but
+ *     resolves OUTSIDE it. We `path.resolve` first so `..` is collapsed.
+ *   - BOUNDARY CONFUSION: `/tmpfoo` starts with `/tmp` yet is a different tree.
+ *     We compare with `path.relative` (a real path boundary), not a substring.
+ *   - SYMLINK ESCAPE: an allowed dir containing a symlink to `/etc` would read
+ *     `/etc`. We resolve symlinks (of the longest existing ancestor) before the
+ *     boundary check, and resolve the policy roots the same way so they stay
+ *     comparable.
+ *
+ * Default-DENY: a path must match an allow root for the requested mode and must
+ * not fall under any deny root. This mirrors the previous behaviour (an empty
+ * allow list denied everything) while fixing the bypasses.
+ */
+
+import fs from "node:fs";
+import path from "node:path";
+
+/** Real path of `abs`, resolving symlinks of the LONGEST EXISTING ancestor and
+ * re-appending the non-existent tail — so a symlinked existing parent is caught
+ * even when the leaf (e.g. a not-yet-created write target) does not exist. */
+function resolveReal(abs, realpath) {
+  let cur = abs;
+  const tail = [];
+  // Bounded by the path depth; each iteration strips one segment.
+  for (;;) {
+    try {
+      const real = realpath(cur);
+      return tail.length ? path.join(real, ...tail.reverse()) : real;
+    } catch {
+      const parent = path.dirname(cur);
+      if (parent === cur) return abs; // hit the root, nothing on this path exists
+      tail.push(path.basename(cur));
+      cur = parent;
+    }
+  }
+}
+
+/** Is `target` the same as, or nested inside, `root`? Uses a real path boundary
+ * (via `path.relative`) so `/tmpfoo` is NOT inside `/tmp` and `..` can't sneak
+ * out. Cross-platform (handles Windows drive letters + separators). */
+export function isWithinRoot(root, target) {
+  if (!root) return false;
+  const rel = path.relative(root, target);
+  return rel === "" || (!rel.startsWith("..") && !path.isAbsolute(rel));
+}
+
+function normalizeRoot(root, cwd, realpath) {
+  return resolveReal(path.resolve(cwd, String(root)), realpath);
+}
+
+/**
+ * Evaluate filesystem access for a target path under a policy.
+ *
+ * @param {string} target  a path (relative resolves against `cwd`)
+ * @param {object} opts
+ * @param {"read"|"write"} [opts.mode="read"]
+ * @param {{read?:string[], write?:string[], denied?:string[]}} [opts.policy]
+ * @param {string} [opts.cwd]        base for relative targets/roots
+ * @param {(p:string)=>string} [opts.realpath]  injectable for tests
+ * @returns {{allowed:boolean, path:string|null, reason:string}}
+ */
+export function evaluatePathAccess(target, opts = {}) {
+  const {
+    mode = "read",
+    policy = {},
+    cwd = process.cwd(),
+    realpath = fs.realpathSync,
+  } = opts;
+
+  if (target == null || String(target).trim() === "") {
+    return { allowed: false, path: null, reason: "empty path" };
+  }
+  if (mode !== "read" && mode !== "write") {
+    return { allowed: false, path: null, reason: `unknown mode "${mode}"` };
+  }
+
+  const abs = path.resolve(cwd, String(target)); // collapses `..`
+  const real = resolveReal(abs, realpath); // resolves symlink escapes
+
+  const denied = policy.denied || [];
+  for (const d of denied) {
+    if (isWithinRoot(normalizeRoot(d, cwd, realpath), real)) {
+      return { allowed: false, path: real, reason: `denied by ${d}` };
+    }
+  }
+
+  const allowList = (mode === "read" ? policy.read : policy.write) || [];
+  for (const a of allowList) {
+    if (isWithinRoot(normalizeRoot(a, cwd, realpath), real)) {
+      return { allowed: true, path: real, reason: `within ${a}` };
+    }
+  }
+
+  // Default-deny: not under any allowed root for this mode.
+  return {
+    allowed: false,
+    path: real,
+    reason: allowList.length
+      ? `outside all allowed ${mode} roots`
+      : `no allowed ${mode} roots`,
+  };
+}

package/src/lib/sandbox-network-policy.js

@@ -33,6 +33,13 @@ export function extractHost(target) {
   }
   // Strip IPv6 brackets ("[::1]" → "::1") — the documented SSRF gotcha.
   if (s.startsWith("[") && s.endsWith("]")) s = s.slice(1, -1);
+  // Strip the trailing DNS root dot. "localhost." / "example.com." resolve to
+  // the exact same host as the dot-less form, but the extra dot defeats BOTH
+  // the deny/allow matcher (host !== "example.com") AND the loopback/private
+  // guard ("localhost." !== "localhost") — a one-character SSRF / deny-list
+  // bypass. (Node's URL already normalizes a trailing dot away for IPv4 literals
+  // but NOT for named hosts, so we must do it here.)
+  s = s.replace(/\.+$/, "");
   return s.toLowerCase() || null;
 }
 
@@ -107,7 +114,17 @@ export function evaluateNetworkAccess(target, policy = {}) {
     allowed.filter((p) => String(p).trim() !== "*"),
   );
   if (explicitNonStar) {
-    return { allowed: true, host, reason: "matched allowedDomains" };
+    // `specific: true` marks a host the user vetted by exact/subdomain name (not
+    // a bare `*`). The egress proxy trusts these even when they resolve to a
+    // private IP (intentional internal/dev allowlisting) and so SKIPS the
+    // DNS-rebinding re-check for them — whereas `*`/permissive allows still get
+    // their resolved IP checked.
+    return {
+      allowed: true,
+      host,
+      reason: "matched allowedDomains",
+      specific: true,
+    };
   }
   // 3) Private / loopback / metadata targets are blocked unless allowed above.
   if (isPrivateHost(host) && !policy.allowPrivate) {

package/src/lib/sandbox-v2.js

@@ -6,6 +6,7 @@
 import crypto from "crypto";
 import { safeJsonParse } from "./safe-json.js";
 import { evaluateNetworkAccess } from "./sandbox-network-policy.js";
+import { evaluatePathAccess } from "./sandbox-fs-policy.js";
 import { createRequire } from "module";
 
 const _require = createRequire(import.meta.url);
@@ -142,20 +143,19 @@ export function ensureSandboxTables(db) {
 // ─── Permission checking ──────────────────────────────────────
 
 function checkFilePermission(permissions, filePath, mode) {
-  const fs = permissions.fileSystem || {};
-  const denied = fs.denied || [];
-  for (const d of denied) {
-    if (filePath.startsWith(d)) return false;
-  }
-  if (mode === "read") {
-    const allowed = fs.read || [];
-    return allowed.some((p) => filePath.startsWith(p));
-  }
-  if (mode === "write") {
-    const allowed = fs.write || [];
-    return allowed.some((p) => filePath.startsWith(p));
-  }
-  return false;
+  // Delegate to the shared path policy: `path.resolve` collapses `..` (traversal),
+  // a `path.relative` boundary rejects `/tmpfoo` matching `/tmp`, and symlinks are
+  // resolved so a link inside an allowed dir can't escape. The old check was
+  // `filePath.startsWith(root)` and let all three through.
+  const fsPol = permissions.fileSystem || {};
+  return evaluatePathAccess(filePath, {
+    mode,
+    policy: {
+      read: fsPol.read || [],
+      write: fsPol.write || [],
+      denied: fsPol.denied || [],
+    },
+  }).allowed;
 }
 
 function checkNetworkPermission(permissions, host) {

package/src/lib/scim-manager.js

@@ -211,6 +211,42 @@ export function _resetState() {
   _syncLog.length = 0;
 }
 
+/**
+ * Rehydrate the in-memory _users Map from the persisted scim_resources table.
+ * The CLI runs each `cc scim` subcommand in a fresh node process, so _users
+ * starts empty every invocation. createUser dual-writes (Map + INSERT INTO
+ * scim_resources) but listUsers/getUser/deleteUser/getStatus are Map-only and
+ * nothing SELECTed the table back — so a provisioned user was invisible next
+ * invocation (`No SCIM users.` / `User not found`), and deleteUser threw before
+ * its DELETE ran, orphaning rows with no CLI path to remove them. The duplicate
+ * check in createUser was also blind, allowing duplicate userNames on disk.
+ * Call after ensureSCIMTables(db).
+ *
+ * Mirrors the write-side shape exactly (active INTEGER→boolean).
+ */
+export function loadFromDb(db) {
+  if (!db) return 0;
+  ensureSCIMTables(db);
+  _users.clear();
+  for (const r of db
+    .prepare(
+      `SELECT id, display_name, user_name, email, active, created_at, updated_at
+         FROM scim_resources WHERE resource_type = 'User' ORDER BY created_at ASC`,
+    )
+    .all()) {
+    _users.set(r.id, {
+      id: r.id,
+      userName: r.user_name,
+      displayName: r.display_name || r.user_name,
+      email: r.email || null,
+      active: !!r.active,
+      createdAt: r.created_at,
+      updatedAt: r.updated_at,
+    });
+  }
+  return _users.size;
+}
+
 /* ═══════════════════════════════════════════════════════════════
  * V2 Surface — SCIM provisioning lifecycle layer.
  * Tracks identities and sync-job lifecycle independent of legacy

package/src/lib/session-manager.js

@@ -129,10 +129,13 @@ export function getSession(db, sessionId) {
 
   return {
     ...session,
-    messages: JSON.parse(session.messages || "[]"),
+    // A single corrupt (non-JSON, non-empty) column must not make the whole
+    // session unloadable — that would block resume of the user's own data.
+    // Matches the safeJsonParse fallback listSessions already uses.
+    messages: safeJsonParse(session.messages, []),
     metadata:
       typeof session.metadata === "string"
-        ? JSON.parse(session.metadata || "{}")
+        ? safeJsonParse(session.metadata, {})
         : session.metadata || {},
   };
 }

package/src/lib/settings-hooks.cjs

@@ -48,6 +48,7 @@ const HOOK_EVENTS = Object.freeze([
   "ConfigChange",
   "PreCompact",
   "Notification",
+  "PermissionRequest",
 ]);
 
 /**