@wrongstack/core 0.303.0 → 0.305.1

package/dist/session-catalog/project-server.js

@@ -2,10 +2,10 @@
 
 // src/session-catalog/project-server.ts
 import { randomBytes as randomBytes2, randomUUID as randomUUID2 } from "node:crypto";
-import * as fs3 from "node:fs";
 import * as fsp from "node:fs/promises";
 import * as net from "node:net";
 import * as path3 from "node:path";
+import { bindProjectEndpoint } from "@wrongstack/persistence";
 
 // src/security/file-permissions.ts
 import { chmod } from "node:fs/promises";
@@ -177,17 +177,9 @@ function useDaemonPerfDefaults() {
 
 // src/session-catalog/endpoint.ts
 import { createHash } from "node:crypto";
-import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 
-// src/utils/socket-path.ts
-import {
-  assertUnixSocketPathWithinLimit,
-  checkUnixSocketPath,
-  unixSocketPathLimit
-} from "@wrongstack/persistence";
-
 // src/session-catalog/protocol.ts
 var SESSION_CATALOG_PROTOCOL_VERSION = 1;
 var SESSION_CATALOG_MAX_FRAME_CHARS = 4 * 1024 * 1024;
@@ -218,15 +210,10 @@ function sessionCatalogProjectServerEndpoint(projectDir) {
 function sessionCatalogProjectServerMetadataPath(projectDir) {
   return path.join(projectDir, SESSION_CATALOG_METADATA_FILE);
 }
-function ensureSessionCatalogSocketDirectory(endpoint2) {
-  if (process.platform === "win32") return;
-  assertUnixSocketPathWithinLimit(endpoint2, "session-catalog");
-  fs.mkdirSync(path.dirname(endpoint2), { recursive: true, mode: 448 });
-}
 
 // src/session-catalog/store.ts
 import { createHash as createHash2, randomBytes, randomUUID, timingSafeEqual } from "node:crypto";
-import * as fs2 from "node:fs";
+import * as fs from "node:fs";
 import * as path2 from "node:path";
 
 // src/coordination/sqlite-mailbox-schema.ts
@@ -567,6 +554,22 @@ function isPidAlive(pid) {
   }
 }
 
+// src/utils/session-scoped-path.ts
+var SESSION_SIDECAR_JSONL_SUFFIXES = [
+  ".replay.jsonl",
+  ".audit.jsonl",
+  ".annotations.jsonl"
+];
+var RESERVED_SESSION_JSONL_NAMES = /* @__PURE__ */ new Set([
+  "_index.jsonl",
+  "_mailbox.jsonl"
+]);
+function isSessionTranscriptFileName(name) {
+  if (!name.endsWith(".jsonl")) return false;
+  if (RESERVED_SESSION_JSONL_NAMES.has(name)) return false;
+  return !SESSION_SIDECAR_JSONL_SUFFIXES.some((suffix) => name.endsWith(suffix));
+}
+
 // src/session-catalog/store.ts
 var SCHEMA_VERSION = 1;
 var MAX_LEASE_MS = 12e4;
@@ -616,7 +619,7 @@ var SessionCatalogStore = class {
   constructor(projectDir) {
     this.projectDir = projectDir;
     this.sessionsDir = path2.join(projectDir, "sessions");
-    fs2.mkdirSync(this.sessionsDir, { recursive: true, mode: 448 });
+    fs.mkdirSync(this.sessionsDir, { recursive: true, mode: 448 });
     this.databasePath = path2.join(this.sessionsDir, "catalog.sqlite");
     const Database = loadDatabaseSync();
     this.db = new Database(this.databasePath);
@@ -634,12 +637,12 @@ var SessionCatalogStore = class {
       this.db.close();
       const quarantine = `${this.databasePath}.corrupt-${Date.now()}`;
       try {
-        fs2.renameSync(this.databasePath, quarantine);
+        fs.renameSync(this.databasePath, quarantine);
       } catch {
       }
       for (const suffix of ["-wal", "-shm"]) {
         try {
-          fs2.renameSync(`${this.databasePath}${suffix}`, `${quarantine}${suffix}`);
+          fs.renameSync(`${this.databasePath}${suffix}`, `${quarantine}${suffix}`);
         } catch {
         }
       }
@@ -865,7 +868,7 @@ var SessionCatalogStore = class {
       if (this.maintenanceExists(targetSessionId))
         throw conflict(`Session ${targetSessionId} is under maintenance`);
       const catalog = this.db.prepare("SELECT 1 AS yes FROM sessions WHERE session_id=?").get(targetSessionId);
-      if (!catalog && !fs2.existsSync(this.containedPath(`${targetSessionId}.jsonl`)))
+      if (!catalog && !fs.existsSync(this.containedPath(`${targetSessionId}.jsonl`)))
         throw new Error(`Session not found: ${targetSessionId}`);
       const reservationId = randomUUID();
       const now = Date.now();
@@ -1011,7 +1014,7 @@ var SessionCatalogStore = class {
     transcriptRelativePath = normalizedTranscript;
     summaryRelativePath = normalizedSummary;
     const transcript = this.containedPath(transcriptRelativePath);
-    const stat = fs2.existsSync(transcript) ? fs2.statSync(transcript) : void 0;
+    const stat = fs.existsSync(transcript) ? fs.statSync(transcript) : void 0;
     const now = (/* @__PURE__ */ new Date()).toISOString();
     return this.transaction(() => {
       const prior = this.db.prepare("SELECT summary_revision FROM sessions WHERE session_id=?").get(summary.id);
@@ -1052,13 +1055,51 @@ var SessionCatalogStore = class {
       damaged: row.damaged !== 0
     };
   }
-  listCatalog(limit = 100, search) {
-    const bounded = Math.min(MAX_PAGE, Math.max(1, Math.floor(limit)));
-    const rows = search?.trim() ? this.db.prepare(
-      "SELECT * FROM sessions WHERE session_id LIKE ? OR json_extract(summary_json,'$.title') LIKE ? OR json_extract(summary_json,'$.name') LIKE ? ORDER BY COALESCE(json_extract(summary_json,'$.lastActivityAt'),json_extract(summary_json,'$.startedAt')) DESC LIMIT ?"
-    ).all(`%${search.trim()}%`, `%${search.trim()}%`, `%${search.trim()}%`, bounded) : this.db.prepare(
-      "SELECT * FROM sessions ORDER BY COALESCE(json_extract(summary_json,'$.lastActivityAt'),json_extract(summary_json,'$.startedAt')) DESC LIMIT ?"
-    ).all(bounded);
+  listCatalog(criteria = {}) {
+    const requestedLimit = criteria.limit ?? 100;
+    if (!Number.isFinite(requestedLimit)) throw new TypeError("Invalid session catalog limit");
+    const bounded = Math.min(MAX_PAGE, Math.max(1, Math.floor(requestedLimit)));
+    const clauses = [];
+    const values = [];
+    const jsonText = (field) => `CASE WHEN json_valid(summary_json) THEN json_extract(summary_json,'$.${field}') END`;
+    const literalLike = (value) => `%${value.replaceAll("\\", "\\\\").replaceAll("%", "\\%").replaceAll("_", "\\_")}%`;
+    const search = criteria.search?.trim();
+    if (search) {
+      const pattern = literalLike(search);
+      clauses.push(
+        `(session_id LIKE ? ESCAPE '\\' OR ${jsonText("title")} LIKE ? ESCAPE '\\' OR ${jsonText("name")} LIKE ? ESCAPE '\\')`
+      );
+      values.push(pattern, pattern, pattern);
+    }
+    if (criteria.since) {
+      clauses.push(`${jsonText("startedAt")}>=?`);
+      values.push(criteria.since);
+    }
+    if (criteria.until) {
+      clauses.push(`${jsonText("startedAt")}<=?`);
+      values.push(criteria.until);
+    }
+    if (criteria.provider) {
+      clauses.push(`${jsonText("provider")}=?`);
+      values.push(criteria.provider);
+    }
+    if (criteria.model) {
+      clauses.push(`${jsonText("model")}=?`);
+      values.push(criteria.model);
+    }
+    if (criteria.minTokens !== void 0) {
+      if (!Number.isFinite(criteria.minTokens)) throw new TypeError("Invalid minimum token count");
+      clauses.push(`CAST(COALESCE(${jsonText("tokenTotal")},0) AS REAL)>=?`);
+      values.push(criteria.minTokens);
+    }
+    if (criteria.titleContains) {
+      clauses.push(`${jsonText("title")} LIKE ? ESCAPE '\\'`);
+      values.push(literalLike(criteria.titleContains.toLocaleLowerCase()));
+    }
+    const where = clauses.length > 0 ? ` WHERE ${clauses.join(" AND ")}` : "";
+    const rows = this.db.prepare(
+      `SELECT * FROM sessions${where} ORDER BY COALESCE(${jsonText("lastActivityAt")},${jsonText("endedAt")},${jsonText("startedAt")}) DESC,${jsonText("startedAt")} DESC,session_id ASC LIMIT ?`
+    ).all(...values, bounded);
     return rows.map((row) => this.catalogRecord(row));
   }
   getSummary(sessionId) {
@@ -1096,7 +1137,7 @@ var SessionCatalogStore = class {
     if (trimmed) summary.name = this.scrubber.scrub(trimmed).slice(0, 500);
     else delete summary.name;
     const summaryPath = this.containedPath(current.summaryRelativePath);
-    fs2.mkdirSync(path2.dirname(summaryPath), { recursive: true, mode: 448 });
+    fs.mkdirSync(path2.dirname(summaryPath), { recursive: true, mode: 448 });
     await atomicWrite(summaryPath, `${JSON.stringify(summary)}
 `, { mode: 384 });
     try {
@@ -1159,13 +1200,13 @@ var SessionCatalogStore = class {
       path2.join(path2.dirname(transcript), path2.basename(sessionId))
     ];
     const trashRoot = path2.join(this.sessionsDir, "_trash", lease.leaseId);
-    fs2.mkdirSync(trashRoot, { recursive: true, mode: 448 });
+    fs.mkdirSync(trashRoot, { recursive: true, mode: 448 });
     const moved = [];
     try {
       artifacts.forEach((artifact, index) => {
-        if (!fs2.existsSync(artifact)) return;
+        if (!fs.existsSync(artifact)) return;
         const target = path2.join(trashRoot, `${index}-${path2.basename(artifact)}`);
-        fs2.renameSync(artifact, target);
+        fs.renameSync(artifact, target);
         moved.push({ from: artifact, to: target });
       });
       this.transaction(() => {
@@ -1180,17 +1221,17 @@ var SessionCatalogStore = class {
     } catch (error) {
       for (const item of moved.reverse()) {
         try {
-          fs2.mkdirSync(path2.dirname(item.from), { recursive: true, mode: 448 });
-          fs2.renameSync(item.to, item.from);
+          fs.mkdirSync(path2.dirname(item.from), { recursive: true, mode: 448 });
+          fs.renameSync(item.to, item.from);
         } catch {
         }
       }
       throw error;
     }
     try {
-      fs2.rmSync(trashRoot, { recursive: true, force: true });
+      fs.rmSync(trashRoot, { recursive: true, force: true });
       const trashParent = path2.dirname(trashRoot);
-      if (fs2.readdirSync(trashParent).length === 0) fs2.rmdirSync(trashParent);
+      if (fs.readdirSync(trashParent).length === 0) fs.rmdirSync(trashParent);
     } catch {
     }
   }
@@ -1213,7 +1254,7 @@ var SessionCatalogStore = class {
   rebuildCatalog() {
     const summaries = this.walkFiles(this.sessionsDir, ".summary.json");
     const transcripts = this.walkFiles(this.sessionsDir, ".jsonl").filter(
-      (file) => !file.endsWith("_index.jsonl")
+      (file) => isSessionTranscriptFileName(path2.basename(file))
     );
     const ids = /* @__PURE__ */ new Set();
     for (const file of [...summaries, ...transcripts]) {
@@ -1227,10 +1268,10 @@ var SessionCatalogStore = class {
       for (const id of ids) {
         try {
           const summaryFile = this.containedPath(`${id}.summary.json`);
-          const summary = fs2.existsSync(summaryFile) ? parseJson(fs2.readFileSync(summaryFile, "utf8")) : this.summarizeTranscript(id);
+          const summary = fs.existsSync(summaryFile) ? parseJson(fs.readFileSync(summaryFile, "utf8")) : this.summarizeTranscript(id);
           if (!summary || summary.id !== id) throw new Error("summary identity mismatch");
           const transcript = this.containedPath(`${id}.jsonl`);
-          const stat = fs2.existsSync(transcript) ? fs2.statSync(transcript) : void 0;
+          const stat = fs.existsSync(transcript) ? fs.statSync(transcript) : void 0;
           const now = (/* @__PURE__ */ new Date()).toISOString();
           this.db.prepare(
             "INSERT INTO sessions(session_id,transcript_relative_path,summary_relative_path,summary_json,transcript_size,transcript_mtime_ms,summary_revision,indexed_at,damaged) VALUES (?,?,?,?,?,?,?,?,0)"
@@ -1271,7 +1312,7 @@ var SessionCatalogStore = class {
   walkFiles(root, suffix) {
     const result = [];
     const visit = (dir) => {
-      for (const entry of fs2.readdirSync(dir, { withFileTypes: true })) {
+      for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
         if (entry.isDirectory()) {
           if (entry.name !== "_cas" && entry.name !== "_trash") visit(path2.join(dir, entry.name));
         } else if (entry.isFile() && entry.name.endsWith(suffix))
@@ -1283,7 +1324,7 @@ var SessionCatalogStore = class {
   }
   summarizeTranscript(id) {
     const file = this.containedPath(`${id}.jsonl`);
-    const lines = fs2.readFileSync(file, "utf8").split(/\r?\n/);
+    const lines = fs.readFileSync(file, "utf8").split(/\r?\n/);
     let start;
     let endedAt;
     let lastActivityAt;
@@ -1422,7 +1463,16 @@ var OPERATION_KEYS = {
   subscribe: ["cursor"],
   unsubscribe: [],
   upsert_summary: ["summary", "transcriptRelativePath", "summaryRelativePath"],
-  list_catalog: ["limit", "search"],
+  list_catalog: [
+    "limit",
+    "search",
+    "since",
+    "until",
+    "provider",
+    "model",
+    "minTokens",
+    "titleContains"
+  ],
   resolve_id: ["query"],
   get_summary: ["sessionId"],
   rename: ["sessionId", "name"],
@@ -1580,10 +1630,7 @@ async function dispatch(op, args) {
     }
     case "list_catalog": {
       const value = args;
-      return catalog.listCatalog(
-        value.limit,
-        value.search
-      );
+      return catalog.listCatalog(value);
     }
     case "resolve_id":
       return catalog.resolveId(
@@ -1786,7 +1833,6 @@ async function stop(_reason) {
   if (process.platform !== "win32") await fsp.rm(endpoint, { force: true }).catch(() => void 0);
   await removeOwnedMetadata();
 }
-ensureSessionCatalogSocketDirectory(endpoint);
 var server = net.createServer((socket) => {
   if (stopping) {
     socket.destroy();
@@ -1810,42 +1856,28 @@ var server = net.createServer((socket) => {
     scheduleIdleStop(disconnectedIdleMs);
   });
 });
-var probing = false;
-function listen() {
-  server.listen(endpoint);
-}
-server.on("error", (error) => {
-  if (error.code === "EADDRINUSE" && process.platform === "win32") {
+void (async () => {
+  const bind = await bindProjectEndpoint({ server, endpoint, service: "session-catalog" });
+  if (bind.outcome === "already-owned") {
     process.exitCode = 0;
     return;
   }
-  if (error.code === "EADDRINUSE" && !probing) {
-    probing = true;
-    const probe = net.createConnection(endpoint);
-    probe.once("connect", () => {
-      probe.destroy();
-      process.exitCode = 0;
-    });
-    probe.once("error", () => {
-      probe.destroy();
-      try {
-        fs3.rmSync(endpoint, { force: true });
-      } catch {
-      }
-      probing = false;
-      listen();
-    });
+  if (bind.outcome === "failed") {
+    process.stderr.write(`session-catalog project server failed: ${bind.error.message}
+`);
+    process.exitCode = 1;
     return;
   }
-  process.exitCode = 1;
-});
-server.on("listening", () => {
-  if (process.platform !== "win32") {
-    try {
-      fs3.chmodSync(endpoint, 384);
-    } catch {
-    }
+  if (bind.reclaimedStaleEndpoint) {
+    process.stderr.write(`session-catalog project server reclaimed stale endpoint ${endpoint}
+`);
   }
+  server.on("error", (error) => {
+    if (stopping) return;
+    process.stderr.write(`session-catalog project server error: ${error.message}
+`);
+    process.exitCode = 1;
+  });
   try {
     store = new SessionCatalogStore(parsed.projectDir);
     void writeMetadata().then(() => metadataReadyResolve?.()).catch(() => void stop("metadata write failed"));
@@ -1854,8 +1886,7 @@ server.on("listening", () => {
     return;
   }
   scheduleIdleStop();
-});
+})();
 process.once("SIGINT", () => void stop("SIGINT"));
 process.once("SIGTERM", () => void stop("SIGTERM"));
-listen();
 //# sourceMappingURL=project-server.js.map

package/dist/session-catalog/protocol.d.ts

@@ -67,6 +67,16 @@ export interface CatalogSessionRecord extends SessionSummary {
     indexedAt: string;
     damaged: boolean;
 }
+export interface SessionCatalogListArgs {
+    limit?: number | undefined;
+    search?: string | undefined;
+    since?: string | undefined;
+    until?: string | undefined;
+    provider?: string | undefined;
+    model?: string | undefined;
+    minTokens?: number | undefined;
+    titleContains?: string | undefined;
+}
 export type SessionCatalogEventKind = 'session.claimed' | 'session.presence_changed' | 'session.closing' | 'session.released' | 'session.catalog_changed' | 'session.deleted' | 'session.rebuild_started' | 'session.rebuild_completed';
 export interface SessionCatalogEvent {
     instanceId: string;
@@ -185,10 +195,7 @@ export interface SessionCatalogOperations {
         result: CatalogSessionRecord;
     };
     list_catalog: {
-        args: {
-            limit?: number;
-            search?: string;
-        };
+        args: SessionCatalogListArgs;
         result: CatalogSessionRecord[];
     };
     resolve_id: {

package/dist/session-catalog/store.d.ts

@@ -1,6 +1,6 @@
 import type { SessionRegistryEntry } from '../session-registry-types.js';
 import type { SessionSummary } from '../types/session.js';
-import type { CatalogSessionRecord, MaintenanceLease, ResumeReservation, SessionCatalogHealth, SessionLeaseCredential } from './protocol.js';
+import type { CatalogSessionRecord, MaintenanceLease, ResumeReservation, SessionCatalogHealth, SessionCatalogListArgs, SessionLeaseCredential } from './protocol.js';
 export declare class SessionCatalogStore {
     readonly projectDir: string;
     readonly databasePath: string;
@@ -52,7 +52,7 @@ export declare class SessionCatalogStore {
     private containedPath;
     upsertSummary(summary: SessionSummary, transcriptRelativePath?: string, summaryRelativePath?: string): CatalogSessionRecord;
     private catalogRecord;
-    listCatalog(limit?: number, search?: string): CatalogSessionRecord[];
+    listCatalog(criteria?: SessionCatalogListArgs): CatalogSessionRecord[];
     getSummary(sessionId: string): CatalogSessionRecord | null;
     resolveId(query: string): string;
     rename(sessionId: string, name: string): Promise<CatalogSessionRecord>;