dsh-locator 0.8.2 → 0.10.0

package/lib/content.d.ts

@@ -15,6 +15,8 @@
  * alone unless `includeArchived` is set.
  * @module dsh-locator/content
  */
+import { Worker } from 'node:worker_threads';
+import { type ContentSearchOptions, type ContentSearchResult } from './content-search.ts';
 import type { LocatorRuntime } from './runtime.ts';
 export interface ContentHit {
     kind: 'file' | 'session';
@@ -25,6 +27,8 @@ export interface ContentHit {
     messageId?: string;
     /** Exact `data-chat-node-key` of the rendered row, when the host has one. */
     nodeKey?: string;
+    /** 1-based line of the first match inside the stored body, for file hits. */
+    line?: number;
     score: number;
 }
 export interface ContentState {
@@ -34,6 +38,11 @@ export interface ContentState {
     messages: number;
     truncated: boolean;
     error: string;
+    /**
+     * Non-fatal problems from the last build/refresh: unreadable session logs,
+     * a quarantined database, and so on. Empty when everything was read.
+     */
+    warnings: string[];
     updatedAt: number;
 }
 export interface ContentOptions {
@@ -58,6 +67,16 @@ export interface ContentOptions {
      * single-threaded.
      */
     searchWorker?: boolean;
+    /**
+     * How long one worker query may run before it is reported as
+     * `content-search-timeout`. The query is never re-run on the host thread.
+     */
+    searchWorkerTimeoutMs?: number;
+    /**
+     * Test seam: build the search worker instead of spawning the compiled one.
+     * Production never sets it.
+     */
+    searchWorkerFactory?: (workerPath: string) => Worker;
 }
 export declare class ContentIndex {
     private readonly rt;
@@ -73,6 +92,8 @@ export declare class ContentIndex {
     private workerSeq;
     private pendingStart;
     private dbIdentity;
+    /** Session id → indexed session log path, for session-scoped content search. */
+    private readonly sessionPaths;
     private readonly pending;
     constructor(rt: LocatorRuntime, options: ContentOptions);
     status(): ContentState;
@@ -111,9 +132,36 @@ export declare class ContentIndex {
     private full;
     private incremental;
     private open;
+    /**
+     * Decide what an existing `content.db` is before touching it:
+     * - `foreign`: no dsh-locator table at all — refuse to modify it.
+     * - `corrupt`: zero bytes, unreadable, or not a SQLite database.
+     * - `incompatible`: has our tables but a different schema version/shape.
+     * - `ok`: safe to reuse.
+     */
+    private classifyDatabase;
+    /**
+     * Move a broken/outdated database aside instead of destroying it. The
+     * timestamped name keeps the bytes around for inspection; if the rename
+     * fails (another process still holds it on Windows) a fresh file is still
+     * created so content search recovers.
+     */
+    private quarantineDatabase;
+    /** Record one non-fatal build warning (deduplicated, bounded). */
+    private addWarning;
     private reopenWorker;
     private stopWorker;
+    /**
+     * Whether a usable search worker exists, creating one when needed.
+     * @returns false when the worker cannot be created at all; that is the only
+     *          case in which an in-process (sync) query is allowed.
+     */
     private ensureWorker;
+    /**
+     * Resolve one worker reply. A malformed reply is reported as a protocol
+     * error; the query is never retried on the host thread.
+     */
+    private onWorkerMessage;
     private identityOf;
     /**
      * Whether the open handle still points at the file on disk. Another DSH
@@ -127,8 +175,6 @@ export declare class ContentIndex {
     private recoverExternal;
     /** Whether the engine is re-scanning, which can move its dump cursor. */
     private engineRescanning;
-    /** Whether `path` is a SQLite database this plugin created (has docs_meta). */
-    private ownedDatabase;
     private readFlag;
     private writeFlag;
     /**
@@ -143,7 +189,15 @@ export declare class ContentIndex {
     /** True when a session log has been quiet long enough to be read safely. */
     private settled;
     private finish;
+    /**
+     * Rebuild the session id → session log path map from the persisted sources.
+     * Runs after `open()` and after every build/refresh, so session-scoped
+     * searches work against an existing database before the first refresh ends.
+     */
+    private refreshSessionPaths;
     private addDoc;
+    /** Body bytes stored for one document key (0 when it is not indexed). */
+    private storedBytes;
     private deleteDoc;
     private deletePath;
     private indexFiles;
@@ -153,19 +207,43 @@ export declare class ContentIndex {
     private readFileDoc;
     private indexSessions;
     private refreshSessions;
-    private indexSessionFile;
+    /** Read and decompress one session log completely; no side effects on rows. */
+    private readSessionText;
+    /** Index one already-decoded session log; the caller owns row replacement. */
+    private indexSessionText;
     /** Session logs to consider, newest first, minus archived ones by default. */
     private sessionCandidates;
     sessionRoots(): string[];
     /**
      * Search file bodies and session messages. With `searchWorker` enabled the
-     * query itself runs off the host thread; a failed or wedged worker falls back
-     * to the in-process query so a result is still produced.
+     * query itself runs off the host thread.
+     *
+     * A worker timeout, crash or malformed reply is a hard error result: the
+     * same query is never re-run on the host thread, where a heavy query (for
+     * example a whole-word scan) would stall the DSH event loop. Only when the
+     * worker cannot be created at all does the query run in-process, and that
+     * fallback is budgeted (bounded counts).
+     *
+     * The two-argument form returns the hit array (legacy callers). The
+     * three-argument form returns hits plus count, warnings and an error code,
+     * and understands the advanced match options.
      * @param query - words or a phrase to find.
      * @param limit - maximum hits.
+     * @param options - match mode, case/whole-word flags, session scope, count mode.
      * @returns matching documents ordered by relevance.
      */
     search(query: string, limit: number): Promise<ContentHit[]>;
+    search(query: string, limit: number, options: ContentSearchOptions): Promise<ContentSearchResult>;
+    private searchDetailed;
+    /** Run one query on the worker; timeout/protocol errors are final results. */
+    private searchInWorker;
+    /** Map a request's sessionId onto the indexed session log path. */
+    private resolveSession;
+    /**
+     * In-process query path. When `degraded` is set (worker creation failed) the
+     * options are tightened so this rare path cannot spend an unbounded amount of
+     * host-thread time counting matches.
+     */
     private searchSync;
 }
 //# sourceMappingURL=content.d.ts.map

package/lib/content.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"content.d.ts","sourceRoot":"","sources":["../src/content.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"content.d.ts","sourceRoot":"","sources":["../src/content.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAYH,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAiB,KAAK,oBAAoB,EAAE,KAAK,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AACxG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AA8BlD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,6EAA6E;IAC7E,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,6EAA6E;IAC7E,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,OAAO,CAAA;IACjB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,OAAO,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;IACb;;;OAGG;IACH,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IAClC,qEAAqE;IACrE,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,wEAAwE;IACxE,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB;;;OAGG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;IACnB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB;;;OAGG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B;;;OAGG;IACH,mBAAmB,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,MAAM,CAAA;CACrD;AAcD,qBAAa,YAAY;IAgBX,OAAO,CAAC,QAAQ,CAAC,EAAE;IAAkB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAfzE,OAAO,CAAC,EAAE,CAA4B;IACtC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiI;IACvJ,OAAO,CAAC,UAAU,CAAI;IACtB,OAAO,CAAC,UAAU,CAAI;IACtB,OAAO,CAAC,aAAa,CAAI;IACzB,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAe;IACzC,OAAO,CAAC,SAAS,CAAI;IACrB,OAAO,CAAC,YAAY,CAAQ;IAC5B,OAAO,CAAC,UAAU,CAA4C;IAC9D,gFAAgF;IAChF,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA4B;IACzD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2D;gBAEtD,EAAE,EAAE,cAAc,EAAmB,OAAO,EAAE,cAAc;IAEzF,MAAM,IAAI,YAAY;IAKtB;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAMnB,wEAAwE;IACxE,YAAY,IAAI,IAAI;IAIpB,+DAA+D;IAC/D,OAAO,IAAI,OAAO;IAMlB,uEAAuE;IACvE,UAAU,IAAI,OAAO;IAMrB,KAAK,IAAI,IAAI;IAYb,qCAAqC;IACrC,KAAK,IAAI,IAAI;IAEb;;;;OAIG;IACH,IAAI,IAAI,IAAI;IAOZ,8EAA8E;IAC9E,OAAO,IAAI,IAAI;IAEf;;;;;OAKG;IACH,OAAO,CAAC,WAAW;IAgCnB,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,KAAK;YAsBC,IAAI;YAUJ,WAAW;IAwBzB,OAAO,CAAC,IAAI;IAoEZ;;;;;;OAMG;IACH,OAAO,CAAC,gBAAgB;IAyBxB;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IAiB1B,kEAAkE;IAClE,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,UAAU;IAQlB;;;;OAIG;IACH,OAAO,CAAC,YAAY;IA6BpB;;;OAGG;IACH,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,UAAU;IASlB;;;;;;OAMG;IACH,OAAO,CAAC,iBAAiB;IAMzB,2EAA2E;IAC3E,OAAO,CAAC,eAAe;IAkBvB,yEAAyE;IACzE,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,QAAQ;IAKhB,OAAO,CAAC,SAAS;IAIjB;;;;OAIG;IACH,OAAO,CAAC,cAAc;IAQtB,OAAO,CAAC,eAAe;IAIvB,+EAA+E;YACjE,OAAO;IAOrB,4EAA4E;IAC5E,OAAO,CAAC,OAAO;IAKf,OAAO,CAAC,MAAM;IAad;;;;OAIG;IACH,OAAO,CAAC,mBAAmB;IAiB3B,OAAO,CAAC,MAAM;IAkBd,yEAAyE;IACzE,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,SAAS;IASjB,OAAO,CAAC,UAAU;YAYJ,UAAU;YA2BV,YAAY;IA8D1B,6EAA6E;IAC7E,OAAO,CAAC,WAAW;YAOL,WAAW;YAQX,aAAa;YAkBb,eAAe;IAgC7B,+EAA+E;YACjE,eAAe;IAY7B,8EAA8E;YAChE,gBAAgB;IAwB9B,8EAA8E;YAChE,iBAAiB;IAa/B,YAAY,IAAI,MAAM,EAAE;IAKxB;;;;;;;;;;;;;;;;;OAiBG;IACG,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAC3D,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,mBAAmB,CAAC;YAMzF,cAAc;IAiB5B,8EAA8E;YAChE,cAAc;IAkC5B,mEAAmE;IACnE,OAAO,CAAC,cAAc;IAQtB;;;;OAIG;IACH,OAAO,CAAC,UAAU;CAYnB"}