@wrongstack/core 0.302.2 → 0.305.0

package/dist/session-catalog/index.js

@@ -1198,6 +1198,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;
@@ -1392,6 +1408,25 @@ var SessionCatalogStore = class {
   leaseRow(sessionId) {
     return this.db.prepare("SELECT * FROM session_leases WHERE session_id=?").get(sessionId);
   }
+  /**
+   * True when `sessionId` has a live `session_leases` row owned by a
+   * different OS process than the *caller*. Used by
+   * `acquireMaintenance` to distinguish "another running wstack" (which
+   * must be fenced off) from "this very TUI owning its own session"
+   * (which is allowed to claim a non-destructive maintenance lease on
+   * its own transcript).
+   *
+   * `callerPid` must be the pid of the process that asked for the lease,
+   * NOT `process.pid`. In the built runtime this store lives inside the
+   * detached project-catalog daemon, so `process.pid` is the daemon's and
+   * would mark every lease — including the caller's own session — foreign,
+   * making `/clear` and `/rewind` fail with "Session … is live". Callers
+   * that run the store in-process may omit it.
+   */
+  foreignLiveLease(sessionId, callerPid = process.pid) {
+    const live = this.leaseRow(sessionId);
+    return Boolean(live) && live.owner_pid !== callerPid;
+  }
   verifyCredential(credential) {
     assertId(credential.sessionId);
     const row = this.leaseRow(credential.sessionId);
@@ -1664,13 +1699,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) {
@@ -1725,11 +1798,14 @@ var SessionCatalogStore = class {
       throw error;
     }
   }
-  acquireMaintenance(sessionId, operation, holderId, leaseMs) {
+  acquireMaintenance(sessionId, operation, holderId, leaseMs, holderPid) {
     assertId(sessionId);
     return this.transaction(() => {
       this.reapExpired();
-      if (this.leaseRow(sessionId)) throw conflict(`Session ${sessionId} is live`);
+      const live = this.leaseRow(sessionId);
+      if (live && (operation === "delete" || this.foreignLiveLease(sessionId, holderPid))) {
+        throw conflict(`Session ${sessionId} is live`);
+      }
       const reservation = this.db.prepare(
         "SELECT 1 AS yes FROM resume_reservations WHERE target_session_id=? AND expires_at>?"
       ).get(sessionId, Date.now());
@@ -1822,7 +1898,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(path4.basename(file))
     );
     const ids = /* @__PURE__ */ new Set();
     for (const file of [...summaries, ...transcripts]) {

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

@@ -567,6 +567,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;
@@ -761,6 +777,25 @@ var SessionCatalogStore = class {
   leaseRow(sessionId) {
     return this.db.prepare("SELECT * FROM session_leases WHERE session_id=?").get(sessionId);
   }
+  /**
+   * True when `sessionId` has a live `session_leases` row owned by a
+   * different OS process than the *caller*. Used by
+   * `acquireMaintenance` to distinguish "another running wstack" (which
+   * must be fenced off) from "this very TUI owning its own session"
+   * (which is allowed to claim a non-destructive maintenance lease on
+   * its own transcript).
+   *
+   * `callerPid` must be the pid of the process that asked for the lease,
+   * NOT `process.pid`. In the built runtime this store lives inside the
+   * detached project-catalog daemon, so `process.pid` is the daemon's and
+   * would mark every lease — including the caller's own session — foreign,
+   * making `/clear` and `/rewind` fail with "Session … is live". Callers
+   * that run the store in-process may omit it.
+   */
+  foreignLiveLease(sessionId, callerPid = process.pid) {
+    const live = this.leaseRow(sessionId);
+    return Boolean(live) && live.owner_pid !== callerPid;
+  }
   verifyCredential(credential) {
     assertId(credential.sessionId);
     const row = this.leaseRow(credential.sessionId);
@@ -1033,13 +1068,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) {
@@ -1094,11 +1167,14 @@ var SessionCatalogStore = class {
       throw error;
     }
   }
-  acquireMaintenance(sessionId, operation, holderId, leaseMs) {
+  acquireMaintenance(sessionId, operation, holderId, leaseMs, holderPid) {
     assertId(sessionId);
     return this.transaction(() => {
       this.reapExpired();
-      if (this.leaseRow(sessionId)) throw conflict(`Session ${sessionId} is live`);
+      const live = this.leaseRow(sessionId);
+      if (live && (operation === "delete" || this.foreignLiveLease(sessionId, holderPid))) {
+        throw conflict(`Session ${sessionId} is live`);
+      }
       const reservation = this.db.prepare(
         "SELECT 1 AS yes FROM resume_reservations WHERE target_session_id=? AND expires_at>?"
       ).get(sessionId, Date.now());
@@ -1191,7 +1267,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]) {
@@ -1400,11 +1476,20 @@ 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"],
-  acquire_maintenance: ["sessionId", "operation", "holderId", "leaseMs"],
+  acquire_maintenance: ["sessionId", "operation", "holderId", "leaseMs", "holderPid"],
   release_maintenance: ["lease"],
   delete: ["sessionId", "lease"],
   prune: ["maxAgeDays", "holderId"],
@@ -1558,10 +1643,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(
@@ -1584,7 +1666,8 @@ async function dispatch(op, args) {
         value.sessionId,
         value.operation,
         value.holderId,
-        value.leaseMs
+        value.leaseMs,
+        value.holderPid
       );
     }
     case "release_maintenance": {

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;
@@ -76,6 +86,12 @@ export interface SessionCatalogEvent {
     generation: number;
     at: string;
 }
+/**
+ * NOTE: adding a field to any `args` below also requires adding it to
+ * `OPERATION_KEYS` in `project-server.ts` — the daemon validates every
+ * request against that allowlist and rejects unknown fields at runtime,
+ * which TypeScript cannot catch.
+ */
 export interface SessionCatalogOperations {
     ping: {
         args: Record<string, never>;
@@ -179,10 +195,7 @@ export interface SessionCatalogOperations {
         result: CatalogSessionRecord;
     };
     list_catalog: {
-        args: {
-            limit?: number;
-            search?: string;
-        };
+        args: SessionCatalogListArgs;
         result: CatalogSessionRecord[];
     };
     resolve_id: {
@@ -210,6 +223,9 @@ export interface SessionCatalogOperations {
             operation: MaintenanceLease['operation'];
             holderId: string;
             leaseMs?: number;
+            /** Caller's OS pid. The server runs in the detached catalog daemon, so
+             *  it cannot use its own `process.pid` to recognise the session owner. */
+            holderPid?: number;
         };
         result: MaintenanceLease;
     };

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;
@@ -17,6 +17,22 @@ export declare class SessionCatalogStore {
     private reapExpired;
     private maintenanceExists;
     private leaseRow;
+    /**
+     * True when `sessionId` has a live `session_leases` row owned by a
+     * different OS process than the *caller*. Used by
+     * `acquireMaintenance` to distinguish "another running wstack" (which
+     * must be fenced off) from "this very TUI owning its own session"
+     * (which is allowed to claim a non-destructive maintenance lease on
+     * its own transcript).
+     *
+     * `callerPid` must be the pid of the process that asked for the lease,
+     * NOT `process.pid`. In the built runtime this store lives inside the
+     * detached project-catalog daemon, so `process.pid` is the daemon's and
+     * would mark every lease — including the caller's own session — foreign,
+     * making `/clear` and `/rewind` fail with "Session … is live". Callers
+     * that run the store in-process may omit it.
+     */
+    private foreignLiveLease;
     private verifyCredential;
     private createLease;
     claimNew(entry: SessionRegistryEntry, ownerInstanceId: string, leaseMs?: number): SessionLeaseCredential;
@@ -36,11 +52,11 @@ 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>;
-    acquireMaintenance(sessionId: string, operation: MaintenanceLease['operation'], holderId: string, leaseMs?: number): MaintenanceLease;
+    acquireMaintenance(sessionId: string, operation: MaintenanceLease['operation'], holderId: string, leaseMs?: number, holderPid?: number): MaintenanceLease;
     releaseMaintenance(lease: MaintenanceLease): void;
     delete(sessionId: string, lease: MaintenanceLease): void;
     prune(maxAgeDays: number, holderId: string): number;