@karmaniverous/jeeves-watcher 0.18.12 → 0.19.0-1

package/README.md

@@ -49,7 +49,7 @@ Add a `vcs` block to your config:
 ```
 
 | Property | Default | Description |
-|----------|---------|-------------|
+| --- | --- | --- |
 | `vcs.enabled` | `false` | Enable git-backed version control globally |
 | `vcs.commitThrottleMs` | `30000` | Throttle interval (ms) for batching file changes into commits. Min: 1000 |
 | `vcs.maxBatchSize` | `1000` | Maximum files per commit batch. Flushes immediately when exceeded. Min: 1 |
@@ -137,22 +137,22 @@ To prevent unbounded history growth, the squash retention system periodically co
 
 ### API Endpoints
 
-| Endpoint | Method | Description |
-|----------|--------|-------------|
-| `/vcs/status` | GET | VCS state for all roots |
-| `/vcs/history` | GET | Commit history for a path/glob |
-| `/vcs/show` | GET | File content at a specific commit |
-| `/vcs/diff` | GET | Diff between commits |
-| `/vcs/revert` | POST | Restore files from a past commit |
-| `/vcs/exclude` | POST | Manage gitignore exclusions |
-| `/vcs/check-exclusion` | GET | Check gitignore status of a path |
+| Endpoint               | Method | Description                       |
+| ---------------------- | ------ | --------------------------------- |
+| `/vcs/status`          | GET    | VCS state for all roots           |
+| `/vcs/history`         | GET    | Commit history for a path/glob    |
+| `/vcs/show`            | GET    | File content at a specific commit |
+| `/vcs/diff`            | GET    | Diff between commits              |
+| `/vcs/revert`          | POST   | Restore files from a past commit  |
+| `/vcs/exclude`         | POST   | Manage gitignore exclusions       |
+| `/vcs/check-exclusion` | GET    | Check gitignore status of a path  |
 
 ## JsonMap Built-in Helpers
 
 The following helpers are available in every JsonMap `lib` context:
 
 | Helper | Description |
-|--------|-------------|
+| --- | --- |
 | `split(str, sep)` | Split a string into an array |
 | `slice(arr, start, end?)` | Slice an array |
 | `join(arr, sep)` | Join an array into a string |

package/config.schema.json

@@ -1088,19 +1088,11 @@
     "__schema94": {
       "anyOf": [
         {
-          "anyOf": [
-            {
-              "type": "string"
-            },
-            {
-              "type": "number"
-            },
-            {
-              "type": "boolean"
-            },
-            {
-              "type": "null"
-            }
+          "type": [
+            "string",
+            "number",
+            "boolean",
+            "null"
           ]
         },
         {

package/dist/cli/jeeves-watcher/{index-C2iJGo8u.js → index-BVfdWEhb.js}

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-import { createConfigQueryHandler as createConfigQueryHandler$1, createStatusHandler, createConfigApplyHandler, DEFAULT_PORTS, getBindAddress } from '@karmaniverous/jeeves';
-import { p as normalizeSlashes, n as normalizeError, e as execFileAsync, b as GIT_TIMEOUT_STANDARD, G as GIT_TIMEOUT_CHERRY_PICK, d as buildAuthenticatedPushUrl, a as GIT_TIMEOUT_PUSH, h as getExecErrorFields, r as retry, j as gitAddViaStdin, o as normalizePathCase, g as findRootForPath, c as GitignoreFilter, f as executeReindex, V as VALID_REINDEX_SCOPES, m as mergeInferenceRules, k as isPathWatched, i as getWatchRootBases, C as CONFIG_WATCH_VALID_SCOPES, s as sleep, l as loadConfig } from './index.js';
+import { createConfigApplyHandler, createConfigQueryHandler as createConfigQueryHandler$1, createStatusHandler, DEFAULT_PORTS, getBindAddress } from '@karmaniverous/jeeves';
+import { n as normalizeSlashes, a as normalizeError, e as execFileAsync, G as GIT_TIMEOUT_STANDARD, b as GIT_TIMEOUT_CHERRY_PICK, c as buildAuthenticatedPushUrl, d as GIT_TIMEOUT_PUSH, g as getExecErrorFields, r as retry, f as gitAddViaStdin, h as normalizePathCase, i as findRootForPath, j as GitignoreFilter, k as executeReindex, V as VALID_REINDEX_SCOPES, m as mergeInferenceRules, l as isPathWatched, o as getWatchRootBases, C as CONFIG_WATCH_VALID_SCOPES, s as sleep, p as loadConfig } from './index.js';
 export { q as startFromConfig } from './index.js';
 import { mkdirSync, existsSync, readFileSync, writeFileSync, rmSync, renameSync, readdirSync, statSync } from 'node:fs';
-import { join, dirname, resolve, extname, basename, relative, sep, isAbsolute } from 'node:path';
-import Database from 'better-sqlite3';
+import { join, dirname, resolve, extname, basename, sep, isAbsolute, relative } from 'node:path';
+import { DatabaseSync } from 'node:sqlite';
 import { z } from 'zod';
 import Ajv from 'ajv';
 import addFormats from 'ajv-formats';
@@ -25,7 +25,6 @@ import { capitalize, title, camel, snake, dash, isEqual, get, omit } from 'radas
 import rehypeParse from 'rehype-parse';
 import { unified } from 'unified';
 import { dump, load } from 'js-yaml';
-import 'ignore';
 import chokidar from 'chokidar';
 import Fastify from 'fastify';
 import crypto from 'crypto';
@@ -38,6 +37,7 @@ import mammoth from 'mammoth';
 import { MarkdownTextSplitter, RecursiveCharacterTextSplitter } from '@langchain/textsplitters';
 import { QdrantClient } from '@qdrant/js-client-rest';
 import 'cosmiconfig';
+import 'ignore';
 import 'node:child_process';
 import 'node:util';
 
@@ -228,10 +228,12 @@ class EnrichmentStore {
         this.logger = logger;
         mkdirSync(stateDir, { recursive: true });
         const dbPath = join(stateDir, 'enrichments.sqlite');
-        this.db = new Database(dbPath);
-        this.db.pragma('journal_mode = WAL');
-        this.db.pragma('busy_timeout = ' + BUSY_TIMEOUT_MS.toString());
-        const [checkpointStatus] = this.db.pragma('wal_checkpoint(TRUNCATE)');
+        this.db = new DatabaseSync(dbPath);
+        this.db.exec('PRAGMA journal_mode = WAL;');
+        this.db.exec('PRAGMA busy_timeout = ' + BUSY_TIMEOUT_MS.toString() + ';');
+        const checkpointStatus = this.db
+            .prepare('PRAGMA wal_checkpoint(TRUNCATE)')
+            .get();
         if (checkpointStatus && checkpointStatus.busy > 0) {
             // EnrichmentStore is expected to be single-writer. If we see a busy WAL
             // checkpoint at startup, it's most likely from an unclean shutdown where
@@ -3195,61 +3197,6 @@ async function applyRules(compiledRules, attributes, options = {}) {
     return { metadata: merged, renderedContent, matchedRules, renderAs };
 }
 
-/**
- * @module vcs/resolveWatchRoot
- * Resolves which VCS-enabled watch root(s) own a given absolute path or glob.
- */
-/**
- * Resolve which VCS-enabled watch root owns an absolute path.
- *
- * @param coordinator - The VcsCoordinator with root information.
- * @param absolutePath - An absolute filesystem path.
- * @returns The matching root and relative path, or undefined if no root matches.
- */
-function resolveWatchRoot(coordinator, absolutePath) {
-    const normalized = normalizeSlashes(resolve(absolutePath));
-    const root = findRootForPath(coordinator.getRoots(), normalized);
-    if (!root)
-        return undefined;
-    return {
-        root,
-        relativePath: normalizeSlashes(relative(root, normalized)),
-    };
-}
-/**
- * Resolve which VCS-enabled watch roots match a glob pattern.
- * For globs that could span multiple roots, returns all matching roots.
- *
- * @param coordinator - The VcsCoordinator with root information.
- * @param glob - An absolute glob pattern.
- * @returns Array of matching roots with relative glob patterns.
- */
-function resolveWatchRootsForGlob(coordinator, glob) {
-    const normalizedGlob = normalizeSlashes(glob);
-    const roots = coordinator.getRoots();
-    const results = [];
-    const compareGlob = normalizePathCase(normalizedGlob);
-    for (const root of roots) {
-        const compareRoot = normalizePathCase(root);
-        if (compareGlob.startsWith(compareRoot + '/') ||
-            compareGlob === compareRoot) {
-            // Glob is under this root
-            results.push({
-                root,
-                relativePath: normalizeSlashes(relative(root, normalizedGlob)),
-            });
-        }
-        else if (compareRoot.startsWith(compareGlob.replace(/[*?[\]{}]/g, ''))) {
-            // Root is under the glob's base path — include with root-relative glob
-            results.push({
-                root,
-                relativePath: '.',
-            });
-        }
-    }
-    return results;
-}
-
 /**
  * @module vcs/validateStateDirOverlap
  * Validates that stateDir does not overlap with any watch path.
@@ -3284,68 +3231,6 @@ function validateStateDirOverlap(stateDir, watchPaths) {
     }
 }
 
-/**
- * @module app/watcherFactory
- * Factory helpers for creating and rebuilding the filesystem watcher.
- * Extracted from initialization.ts to follow SRP.
- */
-/**
- * Create file system watcher with gitignore filtering.
- */
-function createWatcher(config, factories, queue, processor, logger, runtimeOptions, initialScanTracker, contentHashCache, onVcsFileChange, onInitialScanComplete) {
-    const respectGitignore = config.watch.respectGitignore ?? true;
-    const gitignoreFilter = respectGitignore
-        ? new GitignoreFilter(extractWatchPathStrings(config.watch.paths))
-        : undefined;
-    const watcher = factories.createFileSystemWatcher(config.watch, queue, processor, logger, {
-        maxRetries: config.maxRetries ?? runtimeOptions.maxRetries,
-        maxBackoffMs: config.maxBackoffMs ?? runtimeOptions.maxBackoffMs,
-        onFatalError: runtimeOptions.onFatalError,
-        gitignoreFilter,
-        initialScanTracker,
-        contentHashCache,
-        onVcsFileChange,
-        onInitialScanComplete,
-    });
-    return { watcher, gitignoreFilter };
-}
-/**
- * Tear down and rebuild the filesystem watcher with new config.
- * Falls back to the old watcher if the new one fails to start.
- */
-async function rebuildWatcher(newConfig, factories, queue, processor, logger, runtimeOptions, oldState, initialScanTracker, contentHashCache, onVcsFileChange, onInitialScanComplete) {
-    try {
-        await oldState.watcher.stop();
-        const { watcher: newWatcher, gitignoreFilter: newGitignoreFilter } = createWatcher(newConfig, factories, queue, processor, logger, runtimeOptions, initialScanTracker, contentHashCache, onVcsFileChange, onInitialScanComplete);
-        newWatcher.start();
-        logger.info('Filesystem watcher rebuilt successfully');
-        return { watcher: newWatcher, gitignoreFilter: newGitignoreFilter };
-    }
-    catch (error) {
-        logger.error({ err: normalizeError(error) }, 'Failed to rebuild watcher, restoring previous');
-        try {
-            oldState.watcher.start();
-        }
-        catch (restartError) {
-            logger.error({ err: normalizeError(restartError) }, 'Failed to restart previous watcher');
-        }
-        return oldState;
-    }
-}
-/**
- * Check whether watch-relevant config fields changed between old and new config.
- */
-function watchConfigChanged(oldConfig, newConfig) {
-    return (JSON.stringify(oldConfig.watch.paths) !==
-        JSON.stringify(newConfig.watch.paths) ||
-        JSON.stringify(oldConfig.watch.ignored) !==
-            JSON.stringify(newConfig.watch.ignored) ||
-        JSON.stringify(oldConfig.watch.moveDetection) !==
-            JSON.stringify(newConfig.watch.moveDetection) ||
-        (oldConfig.watch.respectGitignore ?? true) !==
-            (newConfig.watch.respectGitignore ?? true));
-}
-
 /**
  * @module app/initialization
  * Initialization helpers for JeevesWatcher. Extracted to follow SRP.
@@ -3488,6 +3373,68 @@ async function initVcs(config, logger) {
     return true;
 }
 
+/**
+ * @module app/watcherFactory
+ * Factory helpers for creating and rebuilding the filesystem watcher.
+ * Extracted from initialization.ts to follow SRP.
+ */
+/**
+ * Create file system watcher with gitignore filtering.
+ */
+function createWatcher(config, factories, queue, processor, logger, runtimeOptions, initialScanTracker, contentHashCache, onVcsFileChange, onInitialScanComplete) {
+    const respectGitignore = config.watch.respectGitignore ?? true;
+    const gitignoreFilter = respectGitignore
+        ? new GitignoreFilter(extractWatchPathStrings(config.watch.paths))
+        : undefined;
+    const watcher = factories.createFileSystemWatcher(config.watch, queue, processor, logger, {
+        maxRetries: config.maxRetries ?? runtimeOptions.maxRetries,
+        maxBackoffMs: config.maxBackoffMs ?? runtimeOptions.maxBackoffMs,
+        onFatalError: runtimeOptions.onFatalError,
+        gitignoreFilter,
+        initialScanTracker,
+        contentHashCache,
+        onVcsFileChange,
+        onInitialScanComplete,
+    });
+    return { watcher, gitignoreFilter };
+}
+/**
+ * Tear down and rebuild the filesystem watcher with new config.
+ * Falls back to the old watcher if the new one fails to start.
+ */
+async function rebuildWatcher(newConfig, factories, queue, processor, logger, runtimeOptions, oldState, initialScanTracker, contentHashCache, onVcsFileChange, onInitialScanComplete) {
+    try {
+        await oldState.watcher.stop();
+        const { watcher: newWatcher, gitignoreFilter: newGitignoreFilter } = createWatcher(newConfig, factories, queue, processor, logger, runtimeOptions, initialScanTracker, contentHashCache, onVcsFileChange, onInitialScanComplete);
+        newWatcher.start();
+        logger.info('Filesystem watcher rebuilt successfully');
+        return { watcher: newWatcher, gitignoreFilter: newGitignoreFilter };
+    }
+    catch (error) {
+        logger.error({ err: normalizeError(error) }, 'Failed to rebuild watcher, restoring previous');
+        try {
+            oldState.watcher.start();
+        }
+        catch (restartError) {
+            logger.error({ err: normalizeError(restartError) }, 'Failed to restart previous watcher');
+        }
+        return oldState;
+    }
+}
+/**
+ * Check whether watch-relevant config fields changed between old and new config.
+ */
+function watchConfigChanged(oldConfig, newConfig) {
+    return (JSON.stringify(oldConfig.watch.paths) !==
+        JSON.stringify(newConfig.watch.paths) ||
+        JSON.stringify(oldConfig.watch.ignored) !==
+            JSON.stringify(newConfig.watch.ignored) ||
+        JSON.stringify(oldConfig.watch.moveDetection) !==
+            JSON.stringify(newConfig.watch.moveDetection) ||
+        (oldConfig.watch.respectGitignore ?? true) !==
+            (newConfig.watch.respectGitignore ?? true));
+}
+
 /**
  * @module app/configReload
  * Config-reload orchestration extracted from JeevesWatcher to follow SRP.
@@ -3579,6 +3526,49 @@ class ConfigWatcher {
     }
 }
 
+/**
+ * @module api/handlers/configApply
+ * Fastify route handler for POST /config/apply. Deep-merges a partial config
+ * patch into the running config file, validates the result, writes it
+ * atomically, and fires the apply callback.
+ */
+/**
+ * Check whether a value is a plain object (not null, not an array).
+ *
+ * @param value - Value to check.
+ * @returns True for plain objects.
+ */
+function isPlainObject$1(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+/**
+ * Create handler for POST /config/apply.
+ *
+ * @remarks
+ * Delegates to core `createConfigApplyHandler`, passing the service's own
+ * config path so the patch is merged into the file the service actually
+ * loaded (not a path derived from `configRoot`, which may be unset or
+ * different in the service process). Accepts `{ patch }` (sent by the
+ * plugin's `watcher_config_apply`) or `{ config }`.
+ *
+ * @param deps - Route dependencies.
+ */
+function createConfigApplyRouteHandler(deps) {
+    const apply = createConfigApplyHandler({ ...deps.descriptor, onConfigApply: deps.onConfigApply }, deps.configPath || undefined);
+    return async (request, reply) => {
+        const body = request.body ?? {};
+        const patch = body.patch ?? body.config ?? {};
+        if (!isPlainObject$1(patch)) {
+            return reply.status(400).send({
+                error: 'Config validation failed',
+                issues: [{ path: ['patch'], message: 'patch must be an object' }],
+            });
+        }
+        const result = await apply({ patch, replace: body.replace === true });
+        return reply.status(result.status).send(result.body);
+    };
+}
+
 /**
  * @module rules/attributes
  * Builds file attribute objects for rule matching. Pure function: derives attributes from path, stats, and extracted data.
@@ -4784,6 +4774,61 @@ function createSearchHandler(deps) {
     }, deps.logger, 'Search');
 }
 
+/**
+ * @module vcs/resolveWatchRoot
+ * Resolves which VCS-enabled watch root(s) own a given absolute path or glob.
+ */
+/**
+ * Resolve which VCS-enabled watch root owns an absolute path.
+ *
+ * @param coordinator - The VcsCoordinator with root information.
+ * @param absolutePath - An absolute filesystem path.
+ * @returns The matching root and relative path, or undefined if no root matches.
+ */
+function resolveWatchRoot(coordinator, absolutePath) {
+    const normalized = normalizeSlashes(resolve(absolutePath));
+    const root = findRootForPath(coordinator.getRoots(), normalized);
+    if (!root)
+        return undefined;
+    return {
+        root,
+        relativePath: normalizeSlashes(relative(root, normalized)),
+    };
+}
+/**
+ * Resolve which VCS-enabled watch roots match a glob pattern.
+ * For globs that could span multiple roots, returns all matching roots.
+ *
+ * @param coordinator - The VcsCoordinator with root information.
+ * @param glob - An absolute glob pattern.
+ * @returns Array of matching roots with relative glob patterns.
+ */
+function resolveWatchRootsForGlob(coordinator, glob) {
+    const normalizedGlob = normalizeSlashes(glob);
+    const roots = coordinator.getRoots();
+    const results = [];
+    const compareGlob = normalizePathCase(normalizedGlob);
+    for (const root of roots) {
+        const compareRoot = normalizePathCase(root);
+        if (compareGlob.startsWith(compareRoot + '/') ||
+            compareGlob === compareRoot) {
+            // Glob is under this root
+            results.push({
+                root,
+                relativePath: normalizeSlashes(relative(root, normalizedGlob)),
+            });
+        }
+        else if (compareRoot.startsWith(compareGlob.replace(/[*?[\]{}]/g, ''))) {
+            // Root is under the glob's base path — include with root-relative glob
+            results.push({
+                root,
+                relativePath: '.',
+            });
+        }
+    }
+    return results;
+}
+
 /**
  * @module api/handlers/vcs/vcsCheckExclusion
  * Fastify route handler for GET /vcs/check-exclusion. Checks gitignore status of a path.
@@ -5639,20 +5684,15 @@ function createApiServer(options) {
         logger,
         configDir: dirname(configPath),
     }));
-    const coreConfigApplyHandler = createConfigApplyHandler({
-        ...descriptor,
+    app.post(getEndpoint('configApply').path, createConfigApplyRouteHandler({
+        descriptor,
+        configPath,
         onConfigApply: () => {
             const cfg = getConfig();
-            const reindexScope = cfg.configWatch?.reindex ?? 'issues';
-            triggerReindex(reindexScope);
+            triggerReindex(cfg.configWatch?.reindex ?? 'issues');
             return Promise.resolve();
         },
-    });
-    app.post(getEndpoint('configApply').path, async (request, reply) => {
-        const { patch, replace } = request.body;
-        const result = await coreConfigApplyHandler({ patch, replace });
-        return reply.status(result.status).send(result.body);
-    });
+    }));
     // Virtual rules and points deletion routes
     if (virtualRuleStore) {
         const onRulesChanged = createOnRulesChanged({
@@ -7261,14 +7301,14 @@ class VectorStoreClient {
      * @returns An array of search results.
      */
     async search(vector, limit, filter, offset) {
-        const results = await this.client.search(this.collectionName, {
-            vector,
+        const { points } = await this.client.query(this.collectionName, {
+            query: vector,
             limit,
             with_payload: true,
             ...(filter ? { filter } : {}),
             ...(offset !== undefined ? { offset } : {}),
         });
-        return results.map((r) => ({
+        return points.map((r) => ({
             id: String(r.id),
             score: r.score,
             payload: r.payload,

package/dist/cli/jeeves-watcher/index.js

@@ -18,6 +18,45 @@ import { promisify } from 'node:util';
  * @module api/handlers/configMerge
  * Shared config merge utilities.
  */
+/**
+ * Check whether a value is a plain object (not null, not an array).
+ *
+ * @param value - Value to check.
+ * @returns True for plain objects.
+ */
+function isPlainObject(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+/**
+ * Deep-merge a config patch into a base config.
+ *
+ * @remarks
+ * Plain objects are merged recursively; arrays and scalars in the patch
+ * replace the base value. `inferenceRules` is merged by rule name (see
+ * {@link mergeInferenceRules}). Neither input is mutated.
+ *
+ * @param base - The current config.
+ * @param patch - The partial config to apply.
+ * @returns A new merged config.
+ */
+function deepMergeConfig(base, patch) {
+    const result = { ...base };
+    for (const [key, value] of Object.entries(patch)) {
+        const current = base[key];
+        if (key === 'inferenceRules' && Array.isArray(value)) {
+            result[key] = mergeInferenceRules(Array.isArray(current)
+                ? current
+                : undefined, value);
+        }
+        else if (isPlainObject(current) && isPlainObject(value)) {
+            result[key] = deepMergeConfig(current, value);
+        }
+        else {
+            result[key] = value;
+        }
+    }
+    return result;
+}
 /**
  * Merge inference rules by name: submitted rules replace existing by name, new ones are appended.
  */
@@ -226,7 +265,7 @@ async function startFromConfig(configPath, descriptor) {
     const config = await loadConfig(resolvedPath);
     // Dynamic import breaks the circular dependency between this module
     // and app/index.ts (which defines JeevesWatcher and re-exports startFromConfig).
-    const { JeevesWatcher } = await import('./index-C2iJGo8u.js');
+    const { JeevesWatcher } = await import('./index-BVfdWEhb.js');
     const app = new JeevesWatcher(config, resolvedPath, descriptor);
     installShutdownHandlers(() => app.stop());
     await app.start();
@@ -1585,14 +1624,8 @@ const watcherDescriptor = {
     // onConfigApply is overridden in createApiServer (api/index.ts) via the
     // descriptor passed as a dependency, where it has access to the live
     // reindex tracker and config getter.
-    customMerge: (target, source) => {
-        const mergedRules = mergeInferenceRules(target['inferenceRules'], source['inferenceRules']);
-        return {
-            ...target,
-            ...source,
-            inferenceRules: mergedRules,
-        };
-    },
+    // Deep merge (like core's default) with inferenceRules merged by name.
+    customMerge: deepMergeConfig,
     startCommand: (configPath) => [
         'node',
         resolve(packageRoot, 'dist/cli/jeeves-watcher/index.js'),
@@ -1603,18 +1636,11 @@ const watcherDescriptor = {
     run: async (configPath) => {
         await startFromConfig(configPath, watcherDescriptor);
     },
-    // Content — generateToolsContent is wired in the plugin package
-    // (watcherComponent.ts) where it has access to the API URL for menu generation.
-    sectionId: 'Watcher',
-    refreshIntervalSeconds: 71,
-    generateToolsContent: () => '',
     // Extension points
     customCliCommands: (program) => {
         registerCustomCommands(program);
     },
-    customPluginTools: (api) => {
-        return [];
-    },
+    customPluginTools: () => [],
 };
 
 /**
@@ -1626,4 +1652,4 @@ const watcherDescriptor = {
 const program = createServiceCli(watcherDescriptor);
 program.parse();
 
-export { CONFIG_WATCH_VALID_SCOPES as C, GIT_TIMEOUT_CHERRY_PICK as G, VALID_REINDEX_SCOPES as V, GIT_TIMEOUT_PUSH as a, GIT_TIMEOUT_STANDARD as b, GitignoreFilter as c, buildAuthenticatedPushUrl as d, execFileAsync as e, executeReindex as f, findRootForPath as g, getExecErrorFields as h, getWatchRootBases as i, gitAddViaStdin as j, isPathWatched as k, loadConfig as l, mergeInferenceRules as m, normalizeError as n, normalizePathCase as o, normalizeSlashes as p, startFromConfig as q, retry as r, sleep as s };
+export { CONFIG_WATCH_VALID_SCOPES as C, GIT_TIMEOUT_STANDARD as G, VALID_REINDEX_SCOPES as V, normalizeError as a, GIT_TIMEOUT_CHERRY_PICK as b, buildAuthenticatedPushUrl as c, GIT_TIMEOUT_PUSH as d, execFileAsync as e, gitAddViaStdin as f, getExecErrorFields as g, normalizePathCase as h, findRootForPath as i, GitignoreFilter as j, executeReindex as k, isPathWatched as l, mergeInferenceRules as m, normalizeSlashes as n, getWatchRootBases as o, loadConfig as p, startFromConfig as q, retry as r, sleep as s };

package/dist/index.d.ts

@@ -2029,4 +2029,4 @@ declare class SquashManager {
 }
 
 export { CommitMessageGenerator, ContentHashCache, DocumentProcessor, EnrichmentStore, EventQueue, FileSystemWatcher, GitignoreFilter, InitialScanTracker, IssuesManager, JeevesWatcher, ReindexTracker, SquashManager, SystemHealth, TemplateEngine, ValuesManager, VcsCoordinator, VcsManager, VectorStoreClient, VirtualRuleStore, applyRules, buildAttributes, buildTemplateEngine, compileRules, contentHash, createApiServer, createEmbeddingProvider, createHandlebarsInstance, createLogger, extractText, issueRecordSchema, loadConfig, loadCustomHelpers, mergeEnrichment, pointId, registerBuiltinHelpers, resolveTemplateSource, startFromConfig, watcherDescriptor };
-export type { AllHelpersIntrospection, ApiServerOptions, ApplyRulesOptions, ApplyRulesResult, CollectionInfo, CommitInfo, CompiledRule, CompiledTemplate, DocumentProcessorDeps, DocumentProcessorInterface, EmbeddingProvider, EnrichmentStoreInterface, EventQueueOptions, ExtractedText, Extractor, FileAttributes, FileSystemWatcherOptions, HelperModuleIntrospection, InitialScanStatus, IssueRecord, IssuesFile, JeevesWatcherFactories, JeevesWatcherRuntimeOptions, PayloadFieldSchema, PendingReversion, ProcessFn, ProcessorConfig, ProviderFactory, PushError, ReindexStatus, RenderResult, ResolvedWatchRoot, RuleLogger, ScrollPageResult, ScrolledPoint, SearchResult, SquashResult, SystemHealthOptions, ValuesIndex, VectorPoint, VectorStore, WatchEvent };
+export type { AllHelpersIntrospection, ApiServerOptions, ApplyRulesOptions, ApplyRulesResult, CollectionInfo, CommitInfo, CompiledRule, CompiledTemplate, DocumentProcessorDeps, DocumentProcessorInterface, EmbeddingProvider, EnrichmentStoreInterface, EventQueueOptions, ExtractedText, Extractor, FileAttributes, FileSystemWatcherOptions, HelperModuleIntrospection, InitialScanStatus, IssueRecord, IssuesFile, JeevesWatcherFactories, JeevesWatcherRuntimeOptions, PayloadFieldSchema, PendingReversion, ProcessFn, ProcessorConfig, ProviderFactory, PushError, ReindexStatus, RenderResult, ResolvedWatchRoot, RuleLogger, ScrollPageResult, ScrolledPoint, SearchResult, SquashManagerOptions, SquashResult, SystemHealthOptions, ValuesIndex, VectorPoint, VectorStore, WatchEvent };

package/dist/index.js

@@ -1,5 +1,5 @@
 import { join, dirname, resolve, relative, extname, basename, isAbsolute, sep } from 'node:path';
-import { createConfigQueryHandler as createConfigQueryHandler$1, createStatusHandler, createConfigApplyHandler, substituteEnvVars, DEFAULT_PORTS, getBindAddress, postJson, fetchJson, getPackageVersion } from '@karmaniverous/jeeves';
+import { createConfigApplyHandler, createConfigQueryHandler as createConfigQueryHandler$1, createStatusHandler, substituteEnvVars, DEFAULT_PORTS, getBindAddress, postJson, fetchJson, getPackageVersion } from '@karmaniverous/jeeves';
 import { extractWatchPathStrings, inferenceRuleSchema, jeevesWatcherConfigSchema, normalizeWatchPaths, vcsRetentionConfigSchema, vcsAuthorConfigSchema, getEndpoint, LOGGING_DEFAULTS, API_DEFAULTS, EMBEDDING_DEFAULTS, CONFIG_WATCH_DEFAULTS, WATCH_DEFAULTS, ROOT_DEFAULTS, INIT_CONFIG_TEMPLATE, DEFAULT_PORT as DEFAULT_PORT$1, PLUGIN_PACKAGE, SERVICE_PACKAGE, COMPONENT_NAME } from '@karmaniverous/jeeves-watcher-core';
 export { apiConfigSchema, configWatchConfigSchema, embeddingConfigSchema, inferenceRuleSchema, jeevesWatcherConfigSchema, loggingConfigSchema, vectorStoreConfigSchema, watchConfigSchema } from '@karmaniverous/jeeves-watcher-core';
 import Fastify from 'fastify';
@@ -26,7 +26,7 @@ import { dump, load } from 'js-yaml';
 import crypto from 'crypto';
 import { packageDirectorySync } from 'package-directory';
 import { homedir } from 'node:os';
-import Database from 'better-sqlite3';
+import { DatabaseSync } from 'node:sqlite';
 import { deserialize, serialize } from 'node:v8';
 import chokidar from 'chokidar';
 import { cosmiconfig } from 'cosmiconfig';
@@ -1141,6 +1141,49 @@ async function getPathFileList(targetPath, config, gitignoreFilter) {
     throw new Error(`Path is neither a file nor a directory: ${targetPath}`);
 }
 
+/**
+ * @module api/handlers/configApply
+ * Fastify route handler for POST /config/apply. Deep-merges a partial config
+ * patch into the running config file, validates the result, writes it
+ * atomically, and fires the apply callback.
+ */
+/**
+ * Check whether a value is a plain object (not null, not an array).
+ *
+ * @param value - Value to check.
+ * @returns True for plain objects.
+ */
+function isPlainObject$2(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+/**
+ * Create handler for POST /config/apply.
+ *
+ * @remarks
+ * Delegates to core `createConfigApplyHandler`, passing the service's own
+ * config path so the patch is merged into the file the service actually
+ * loaded (not a path derived from `configRoot`, which may be unset or
+ * different in the service process). Accepts `{ patch }` (sent by the
+ * plugin's `watcher_config_apply`) or `{ config }`.
+ *
+ * @param deps - Route dependencies.
+ */
+function createConfigApplyRouteHandler(deps) {
+    const apply = createConfigApplyHandler({ ...deps.descriptor, onConfigApply: deps.onConfigApply }, deps.configPath || undefined);
+    return async (request, reply) => {
+        const body = request.body ?? {};
+        const patch = body.patch ?? body.config ?? {};
+        if (!isPlainObject$2(patch)) {
+            return reply.status(400).send({
+                error: 'Config validation failed',
+                issues: [{ path: ['patch'], message: 'patch must be an object' }],
+            });
+        }
+        const result = await apply({ patch, replace: body.replace === true });
+        return reply.status(result.status).send(result.body);
+    };
+}
+
 /**
  * @module rules/attributes
  * Builds file attribute objects for rule matching. Pure function: derives attributes from path, stats, and extracted data.
@@ -2775,6 +2818,45 @@ async function applyRules(compiledRules, attributes, options = {}) {
  * @module api/handlers/configMerge
  * Shared config merge utilities.
  */
+/**
+ * Check whether a value is a plain object (not null, not an array).
+ *
+ * @param value - Value to check.
+ * @returns True for plain objects.
+ */
+function isPlainObject$1(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+/**
+ * Deep-merge a config patch into a base config.
+ *
+ * @remarks
+ * Plain objects are merged recursively; arrays and scalars in the patch
+ * replace the base value. `inferenceRules` is merged by rule name (see
+ * {@link mergeInferenceRules}). Neither input is mutated.
+ *
+ * @param base - The current config.
+ * @param patch - The partial config to apply.
+ * @returns A new merged config.
+ */
+function deepMergeConfig(base, patch) {
+    const result = { ...base };
+    for (const [key, value] of Object.entries(patch)) {
+        const current = base[key];
+        if (key === 'inferenceRules' && Array.isArray(value)) {
+            result[key] = mergeInferenceRules(Array.isArray(current)
+                ? current
+                : undefined, value);
+        }
+        else if (isPlainObject$1(current) && isPlainObject$1(value)) {
+            result[key] = deepMergeConfig(current, value);
+        }
+        else {
+            result[key] = value;
+        }
+    }
+    return result;
+}
 /**
  * Merge inference rules by name: submitted rules replace existing by name, new ones are appended.
  */
@@ -4290,91 +4372,6 @@ async function introspectAllHelpers(config, configDir) {
     return result;
 }
 
-/**
- * @module vcs/CommitMessageBuilder
- * Builds commit messages — both template-based and AI-generated.
- */
-/**
- * Builds commit messages for VCS commits.
- * Supports template-based messages and AI-generated messages with fallback.
- */
-class CommitMessageBuilder {
-    rootPath;
-    logger;
-    generator;
-    constructor(rootPath, logger, generator) {
-        this.rootPath = rootPath;
-        this.logger = logger;
-        this.generator = generator;
-    }
-    /**
-     * Build the template commit message (no AI).
-     */
-    buildTemplateMessage(fileCount, isBaseline, pendingReversions) {
-        if (pendingReversions.length === 0) {
-            if (isBaseline) {
-                return `baseline: batch (${String(fileCount)} files)`;
-            }
-            const timestamp = new Date().toISOString();
-            return `watcher: batch ${timestamp} (${String(fileCount)} files)`;
-        }
-        // Count total reverted files across all pending reversions
-        const revertedPaths = new Set(pendingReversions.flatMap((r) => r.paths));
-        const revertedCount = revertedPaths.size;
-        const otherCount = fileCount - revertedCount;
-        // Use the first reversion's glob and commit for the message
-        const { glob, commit } = pendingReversions[0];
-        const shortCommit = commit.slice(0, 7);
-        let message = `revert: ${glob} to ${shortCommit} — restored ${String(revertedCount)} files`;
-        if (otherCount > 0) {
-            message += ` (+ ${String(otherCount)} other changes)`;
-        }
-        return message;
-    }
-    /**
-     * Build the commit message, using AI when available with template fallback.
-     */
-    async buildCommitMessage(files, isBaseline, pendingReversions) {
-        const fileCount = files.length;
-        const templateMessage = this.buildTemplateMessage(fileCount, isBaseline, pendingReversions);
-        if (!this.generator) {
-            return templateMessage;
-        }
-        try {
-            const diffSummary = await this.getStagedDiff();
-            const aiMessage = await this.generator.generate(files, diffSummary);
-            if (!aiMessage) {
-                this.logger.warn('AI commit message generation returned null; using template');
-                return templateMessage;
-            }
-            // For reversions: prefix with revert info + AI description
-            if (pendingReversions.length > 0) {
-                const { glob, commit } = pendingReversions[0];
-                const shortCommit = commit.slice(0, 7);
-                return `revert: ${glob} to ${shortCommit} — ${aiMessage}`;
-            }
-            return aiMessage;
-        }
-        catch (error) {
-            this.logger.warn({ err: normalizeError(error) }, 'AI commit message generation failed; using template');
-            return templateMessage;
-        }
-    }
-    /**
-     * Get the staged diff for AI context.
-     */
-    async getStagedDiff() {
-        try {
-            const { stdout: stat } = await execFileAsync('git', ['diff', '--cached', '--stat'], { cwd: this.rootPath, timeout: GIT_TIMEOUT_STANDARD });
-            const { stdout: patch } = await execFileAsync('git', ['diff', '--cached'], { cwd: this.rootPath, timeout: GIT_TIMEOUT_STANDARD });
-            return `${stat}\n${patch}`;
-        }
-        catch {
-            return '';
-        }
-    }
-}
-
 /**
  * @module vcs/CommitMessageGenerator
  * Generates AI-powered commit messages via the Anthropic Messages API.
@@ -4458,36 +4455,6 @@ class CommitMessageGenerator {
     }
 }
 
-/**
- * @module vcs/resolveCommitMessageApiKey
- * Resolves the API key for AI commit message generation.
- */
-/**
- * Resolve the API key for commit message generation.
- * Checks config first, then falls back to OpenClaw gateway credentials.
- */
-function resolveCommitMessageApiKey(provider, configApiKey, logger) {
-    if (configApiKey) {
-        logger.debug('Using commit message API key from config');
-        return configApiKey;
-    }
-    try {
-        const openclawPath = join(homedir(), '.openclaw', 'openclaw.json');
-        const raw = readFileSync(openclawPath, 'utf8');
-        const parsed = JSON.parse(raw);
-        const gatewayKey = parsed.models?.providers?.[provider]?.apiKey;
-        if (gatewayKey) {
-            logger.debug({ provider }, 'Using commit message API key from OpenClaw gateway config');
-            return gatewayKey;
-        }
-        logger.warn({ provider }, 'OpenClaw gateway config found but no API key for provider');
-    }
-    catch {
-        logger.warn('No commit message API key in config or OpenClaw gateway');
-    }
-    return undefined;
-}
-
 /**
  * @module vcs/SquashManager
  * Handles scheduled squash retention for git-backed VCS roots.
@@ -5081,6 +5048,121 @@ function resolveIgnored(ignored) {
     });
 }
 
+/**
+ * @module vcs/resolveCommitMessageApiKey
+ * Resolves the API key for AI commit message generation.
+ */
+/**
+ * Resolve the API key for commit message generation.
+ * Checks config first, then falls back to OpenClaw gateway credentials.
+ */
+function resolveCommitMessageApiKey(provider, configApiKey, logger) {
+    if (configApiKey) {
+        logger.debug('Using commit message API key from config');
+        return configApiKey;
+    }
+    try {
+        const openclawPath = join(homedir(), '.openclaw', 'openclaw.json');
+        const raw = readFileSync(openclawPath, 'utf8');
+        const parsed = JSON.parse(raw);
+        const gatewayKey = parsed.models?.providers?.[provider]?.apiKey;
+        if (gatewayKey) {
+            logger.debug({ provider }, 'Using commit message API key from OpenClaw gateway config');
+            return gatewayKey;
+        }
+        logger.warn({ provider }, 'OpenClaw gateway config found but no API key for provider');
+    }
+    catch {
+        logger.warn('No commit message API key in config or OpenClaw gateway');
+    }
+    return undefined;
+}
+
+/**
+ * @module vcs/CommitMessageBuilder
+ * Builds commit messages — both template-based and AI-generated.
+ */
+/**
+ * Builds commit messages for VCS commits.
+ * Supports template-based messages and AI-generated messages with fallback.
+ */
+class CommitMessageBuilder {
+    rootPath;
+    logger;
+    generator;
+    constructor(rootPath, logger, generator) {
+        this.rootPath = rootPath;
+        this.logger = logger;
+        this.generator = generator;
+    }
+    /**
+     * Build the template commit message (no AI).
+     */
+    buildTemplateMessage(fileCount, isBaseline, pendingReversions) {
+        if (pendingReversions.length === 0) {
+            if (isBaseline) {
+                return `baseline: batch (${String(fileCount)} files)`;
+            }
+            const timestamp = new Date().toISOString();
+            return `watcher: batch ${timestamp} (${String(fileCount)} files)`;
+        }
+        // Count total reverted files across all pending reversions
+        const revertedPaths = new Set(pendingReversions.flatMap((r) => r.paths));
+        const revertedCount = revertedPaths.size;
+        const otherCount = fileCount - revertedCount;
+        // Use the first reversion's glob and commit for the message
+        const { glob, commit } = pendingReversions[0];
+        const shortCommit = commit.slice(0, 7);
+        let message = `revert: ${glob} to ${shortCommit} — restored ${String(revertedCount)} files`;
+        if (otherCount > 0) {
+            message += ` (+ ${String(otherCount)} other changes)`;
+        }
+        return message;
+    }
+    /**
+     * Build the commit message, using AI when available with template fallback.
+     */
+    async buildCommitMessage(files, isBaseline, pendingReversions) {
+        const fileCount = files.length;
+        const templateMessage = this.buildTemplateMessage(fileCount, isBaseline, pendingReversions);
+        if (!this.generator) {
+            return templateMessage;
+        }
+        try {
+            const diffSummary = await this.getStagedDiff();
+            const aiMessage = await this.generator.generate(files, diffSummary);
+            if (!aiMessage) {
+                this.logger.warn('AI commit message generation returned null; using template');
+                return templateMessage;
+            }
+            // For reversions: prefix with revert info + AI description
+            if (pendingReversions.length > 0) {
+                const { glob, commit } = pendingReversions[0];
+                const shortCommit = commit.slice(0, 7);
+                return `revert: ${glob} to ${shortCommit} — ${aiMessage}`;
+            }
+            return aiMessage;
+        }
+        catch (error) {
+            this.logger.warn({ err: normalizeError(error) }, 'AI commit message generation failed; using template');
+            return templateMessage;
+        }
+    }
+    /**
+     * Get the staged diff for AI context.
+     */
+    async getStagedDiff() {
+        try {
+            const { stdout: stat } = await execFileAsync('git', ['diff', '--cached', '--stat'], { cwd: this.rootPath, timeout: GIT_TIMEOUT_STANDARD });
+            const { stdout: patch } = await execFileAsync('git', ['diff', '--cached'], { cwd: this.rootPath, timeout: GIT_TIMEOUT_STANDARD });
+            return `${stat}\n${patch}`;
+        }
+        catch {
+            return '';
+        }
+    }
+}
+
 /**
  * @module vcs/vcsPush
  * Push logic for VCS commits.
@@ -5588,68 +5670,6 @@ class VcsCoordinator {
     }
 }
 
-/**
- * @module app/watcherFactory
- * Factory helpers for creating and rebuilding the filesystem watcher.
- * Extracted from initialization.ts to follow SRP.
- */
-/**
- * Create file system watcher with gitignore filtering.
- */
-function createWatcher(config, factories, queue, processor, logger, runtimeOptions, initialScanTracker, contentHashCache, onVcsFileChange, onInitialScanComplete) {
-    const respectGitignore = config.watch.respectGitignore ?? true;
-    const gitignoreFilter = respectGitignore
-        ? new GitignoreFilter(extractWatchPathStrings(config.watch.paths))
-        : undefined;
-    const watcher = factories.createFileSystemWatcher(config.watch, queue, processor, logger, {
-        maxRetries: config.maxRetries ?? runtimeOptions.maxRetries,
-        maxBackoffMs: config.maxBackoffMs ?? runtimeOptions.maxBackoffMs,
-        onFatalError: runtimeOptions.onFatalError,
-        gitignoreFilter,
-        initialScanTracker,
-        contentHashCache,
-        onVcsFileChange,
-        onInitialScanComplete,
-    });
-    return { watcher, gitignoreFilter };
-}
-/**
- * Tear down and rebuild the filesystem watcher with new config.
- * Falls back to the old watcher if the new one fails to start.
- */
-async function rebuildWatcher(newConfig, factories, queue, processor, logger, runtimeOptions, oldState, initialScanTracker, contentHashCache, onVcsFileChange, onInitialScanComplete) {
-    try {
-        await oldState.watcher.stop();
-        const { watcher: newWatcher, gitignoreFilter: newGitignoreFilter } = createWatcher(newConfig, factories, queue, processor, logger, runtimeOptions, initialScanTracker, contentHashCache, onVcsFileChange, onInitialScanComplete);
-        newWatcher.start();
-        logger.info('Filesystem watcher rebuilt successfully');
-        return { watcher: newWatcher, gitignoreFilter: newGitignoreFilter };
-    }
-    catch (error) {
-        logger.error({ err: normalizeError(error) }, 'Failed to rebuild watcher, restoring previous');
-        try {
-            oldState.watcher.start();
-        }
-        catch (restartError) {
-            logger.error({ err: normalizeError(restartError) }, 'Failed to restart previous watcher');
-        }
-        return oldState;
-    }
-}
-/**
- * Check whether watch-relevant config fields changed between old and new config.
- */
-function watchConfigChanged(oldConfig, newConfig) {
-    return (JSON.stringify(oldConfig.watch.paths) !==
-        JSON.stringify(newConfig.watch.paths) ||
-        JSON.stringify(oldConfig.watch.ignored) !==
-            JSON.stringify(newConfig.watch.ignored) ||
-        JSON.stringify(oldConfig.watch.moveDetection) !==
-            JSON.stringify(newConfig.watch.moveDetection) ||
-        (oldConfig.watch.respectGitignore ?? true) !==
-            (newConfig.watch.respectGitignore ?? true));
-}
-
 /**
  * @module app/initialization
  * Initialization helpers for JeevesWatcher. Extracted to follow SRP.
@@ -6173,20 +6193,15 @@ function createApiServer(options) {
         logger,
         configDir: dirname(configPath),
     }));
-    const coreConfigApplyHandler = createConfigApplyHandler({
-        ...descriptor,
+    app.post(getEndpoint('configApply').path, createConfigApplyRouteHandler({
+        descriptor,
+        configPath,
         onConfigApply: () => {
             const cfg = getConfig();
-            const reindexScope = cfg.configWatch?.reindex ?? 'issues';
-            triggerReindex(reindexScope);
+            triggerReindex(cfg.configWatch?.reindex ?? 'issues');
             return Promise.resolve();
         },
-    });
-    app.post(getEndpoint('configApply').path, async (request, reply) => {
-        const { patch, replace } = request.body;
-        const result = await coreConfigApplyHandler({ patch, replace });
-        return reply.status(result.status).send(result.body);
-    });
+    }));
     // Virtual rules and points deletion routes
     if (virtualRuleStore) {
         const onRulesChanged = createOnRulesChanged({
@@ -6356,10 +6371,12 @@ class EnrichmentStore {
         this.logger = logger;
         mkdirSync(stateDir, { recursive: true });
         const dbPath = join(stateDir, 'enrichments.sqlite');
-        this.db = new Database(dbPath);
-        this.db.pragma('journal_mode = WAL');
-        this.db.pragma('busy_timeout = ' + BUSY_TIMEOUT_MS.toString());
-        const [checkpointStatus] = this.db.pragma('wal_checkpoint(TRUNCATE)');
+        this.db = new DatabaseSync(dbPath);
+        this.db.exec('PRAGMA journal_mode = WAL;');
+        this.db.exec('PRAGMA busy_timeout = ' + BUSY_TIMEOUT_MS.toString() + ';');
+        const checkpointStatus = this.db
+            .prepare('PRAGMA wal_checkpoint(TRUNCATE)')
+            .get();
         if (checkpointStatus && checkpointStatus.busy > 0) {
             // EnrichmentStore is expected to be single-writer. If we see a busy WAL
             // checkpoint at startup, it's most likely from an unclean shutdown where
@@ -6738,6 +6755,68 @@ class ValuesManager extends BinaryFileStore {
     }
 }
 
+/**
+ * @module app/watcherFactory
+ * Factory helpers for creating and rebuilding the filesystem watcher.
+ * Extracted from initialization.ts to follow SRP.
+ */
+/**
+ * Create file system watcher with gitignore filtering.
+ */
+function createWatcher(config, factories, queue, processor, logger, runtimeOptions, initialScanTracker, contentHashCache, onVcsFileChange, onInitialScanComplete) {
+    const respectGitignore = config.watch.respectGitignore ?? true;
+    const gitignoreFilter = respectGitignore
+        ? new GitignoreFilter(extractWatchPathStrings(config.watch.paths))
+        : undefined;
+    const watcher = factories.createFileSystemWatcher(config.watch, queue, processor, logger, {
+        maxRetries: config.maxRetries ?? runtimeOptions.maxRetries,
+        maxBackoffMs: config.maxBackoffMs ?? runtimeOptions.maxBackoffMs,
+        onFatalError: runtimeOptions.onFatalError,
+        gitignoreFilter,
+        initialScanTracker,
+        contentHashCache,
+        onVcsFileChange,
+        onInitialScanComplete,
+    });
+    return { watcher, gitignoreFilter };
+}
+/**
+ * Tear down and rebuild the filesystem watcher with new config.
+ * Falls back to the old watcher if the new one fails to start.
+ */
+async function rebuildWatcher(newConfig, factories, queue, processor, logger, runtimeOptions, oldState, initialScanTracker, contentHashCache, onVcsFileChange, onInitialScanComplete) {
+    try {
+        await oldState.watcher.stop();
+        const { watcher: newWatcher, gitignoreFilter: newGitignoreFilter } = createWatcher(newConfig, factories, queue, processor, logger, runtimeOptions, initialScanTracker, contentHashCache, onVcsFileChange, onInitialScanComplete);
+        newWatcher.start();
+        logger.info('Filesystem watcher rebuilt successfully');
+        return { watcher: newWatcher, gitignoreFilter: newGitignoreFilter };
+    }
+    catch (error) {
+        logger.error({ err: normalizeError(error) }, 'Failed to rebuild watcher, restoring previous');
+        try {
+            oldState.watcher.start();
+        }
+        catch (restartError) {
+            logger.error({ err: normalizeError(restartError) }, 'Failed to restart previous watcher');
+        }
+        return oldState;
+    }
+}
+/**
+ * Check whether watch-relevant config fields changed between old and new config.
+ */
+function watchConfigChanged(oldConfig, newConfig) {
+    return (JSON.stringify(oldConfig.watch.paths) !==
+        JSON.stringify(newConfig.watch.paths) ||
+        JSON.stringify(oldConfig.watch.ignored) !==
+            JSON.stringify(newConfig.watch.ignored) ||
+        JSON.stringify(oldConfig.watch.moveDetection) !==
+            JSON.stringify(newConfig.watch.moveDetection) ||
+        (oldConfig.watch.respectGitignore ?? true) !==
+            (newConfig.watch.respectGitignore ?? true));
+}
+
 /**
  * @module app/configReload
  * Config-reload orchestration extracted from JeevesWatcher to follow SRP.
@@ -8468,14 +8547,14 @@ class VectorStoreClient {
      * @returns An array of search results.
      */
     async search(vector, limit, filter, offset) {
-        const results = await this.client.search(this.collectionName, {
-            vector,
+        const { points } = await this.client.query(this.collectionName, {
+            query: vector,
             limit,
             with_payload: true,
             ...(filter ? { filter } : {}),
             ...(offset !== undefined ? { offset } : {}),
         });
-        return results.map((r) => ({
+        return points.map((r) => ({
             id: String(r.id),
             score: r.score,
             payload: r.payload,
@@ -9707,14 +9786,8 @@ const watcherDescriptor = {
     // onConfigApply is overridden in createApiServer (api/index.ts) via the
     // descriptor passed as a dependency, where it has access to the live
     // reindex tracker and config getter.
-    customMerge: (target, source) => {
-        const mergedRules = mergeInferenceRules(target['inferenceRules'], source['inferenceRules']);
-        return {
-            ...target,
-            ...source,
-            inferenceRules: mergedRules,
-        };
-    },
+    // Deep merge (like core's default) with inferenceRules merged by name.
+    customMerge: deepMergeConfig,
     startCommand: (configPath) => [
         'node',
         resolve(packageRoot, 'dist/cli/jeeves-watcher/index.js'),
@@ -9725,18 +9798,11 @@ const watcherDescriptor = {
     run: async (configPath) => {
         await startFromConfig(configPath, watcherDescriptor);
     },
-    // Content — generateToolsContent is wired in the plugin package
-    // (watcherComponent.ts) where it has access to the API URL for menu generation.
-    sectionId: 'Watcher',
-    refreshIntervalSeconds: 71,
-    generateToolsContent: () => '',
     // Extension points
     customCliCommands: (program) => {
         registerCustomCommands(program);
     },
-    customPluginTools: (api) => {
-        return [];
-    },
+    customPluginTools: () => [],
 };
 
 export { CommitMessageGenerator, ContentHashCache, DocumentProcessor, EnrichmentStore, EventQueue, FileSystemWatcher, GitignoreFilter, InitialScanTracker, IssuesManager, JeevesWatcher, ReindexTracker, SquashManager, SystemHealth, TemplateEngine, ValuesManager, VcsCoordinator, VcsManager, VectorStoreClient, VirtualRuleStore, applyRules, buildAttributes, buildTemplateEngine, compileRules, contentHash, createApiServer, createEmbeddingProvider, createHandlebarsInstance, createLogger, extractText, issueRecordSchema, loadConfig, loadCustomHelpers, mergeEnrichment, pointId, registerBuiltinHelpers, resolveTemplateSource, startFromConfig, watcherDescriptor };

package/package.json

@@ -7,66 +7,63 @@
     "url": "https://github.com/karmaniverous/jeeves-watcher/issues"
   },
   "dependencies": {
-    "@commander-js/extra-typings": "^14.0.0",
-    "@karmaniverous/jeeves": "^0.5.12",
-    "@karmaniverous/jeeves-watcher-core": "^0.2.5",
+    "@commander-js/extra-typings": "^15.0.0",
+    "@karmaniverous/jeeves": "0.6.0-7",
+    "@karmaniverous/jeeves-watcher-core": "^0.2.6-0",
     "@karmaniverous/jsonmap": "^2.1.1",
     "@langchain/textsplitters": "*",
-    "@qdrant/js-client-rest": "*",
-    "ajv": "~8.18.0",
+    "@qdrant/js-client-rest": "^1.19.0",
+    "ajv": "~8.20.0",
     "ajv-formats": "*",
-    "better-sqlite3": "^12.10.0",
     "cheerio": "^1.2.0",
     "chokidar": "^5.0.0",
     "cosmiconfig": "*",
-    "dayjs": "^1.11.21",
+    "dayjs": "^1.11.23",
     "fastify": "*",
     "handlebars": "^4.7.9",
     "hast-util-to-mdast": "^10.1.2",
-    "ignore": "^7.0.5",
-    "js-yaml": "^4.1.0",
-    "mammoth": "^1.12.0",
+    "ignore": "^7.0.10",
+    "js-yaml": "^5.4.2",
+    "mammoth": "^1.12.3",
     "mdast-util-from-adf": "^2.2.0",
     "mdast-util-to-markdown": "^2.1.2",
     "package-directory": "^8.2.0",
-    "picomatch": "^4.0.4",
+    "picomatch": "^4.0.7",
     "pino": "*",
     "radash": "^12.1.1",
     "rehype-parse": "^9.0.1",
     "unified": "^11.0.5",
-    "unpdf": "^1.6.2",
+    "unpdf": "^1.8.1",
     "uuid": "*",
-    "zod": "^4.4.3"
+    "zod": "^4.6.5"
   },
   "description": "Filesystem watcher that keeps a Qdrant vector store in sync with document changes",
   "devDependencies": {
-    "@dotenvx/dotenvx": "^1.69.1",
+    "@dotenvx/dotenvx": "^2.30.0",
     "@rollup/plugin-alias": "^6.0.0",
-    "@rollup/plugin-commonjs": "^29.0.2",
+    "@rollup/plugin-commonjs": "^29.0.3",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-typescript": "^12.3.0",
-    "@types/better-sqlite3": "^7.6.13",
     "@types/fs-extra": "^11.0.4",
-    "@types/js-yaml": "^4.0.0",
-    "@types/node": "^25.9.1",
+    "@types/node": "^26.6.3",
     "@types/picomatch": "^4.0.3",
-    "@vitest/coverage-v8": "^4.1.7",
+    "@vitest/coverage-v8": "^5.0.2",
     "cross-env": "^10.1.0",
-    "fs-extra": "^11.3.5",
-    "happy-dom": "^20.9.0",
-    "knip": "^6.14.2",
-    "release-it": "^20.0.1",
-    "rollup": "^4.60.4",
-    "rollup-plugin-dts": "^6.4.1",
+    "fs-extra": "^11.4.1",
+    "happy-dom": "^20.14.5",
+    "knip": "^6.38.0",
+    "release-it": "^21.1.0",
+    "rollup": "^4.63.5",
+    "rollup-plugin-dts": "^6.5.1",
     "tslib": "^2.8.1",
-    "typedoc": "^0.28.19",
+    "typedoc": "^0.28.20",
     "typedoc-plugin-mdn-links": "^5.1.1",
     "typedoc-plugin-replace-text": "^4.2.0",
-    "vitest": "^4.1.7"
+    "vitest": "^5.0.2"
   },
   "engines": {
-    "node": ">=22"
+    "node": ">=22.13"
   },
   "exports": {
     ".": {
@@ -110,6 +107,10 @@
       "release": true
     },
     "hooks": {
+      "after:bump": [
+        "npm install --package-lock-only --ignore-scripts",
+        "git add ../../package-lock.json"
+      ],
       "after:init": [
         "npm run lint",
         "npm run typecheck",
@@ -136,18 +137,18 @@
     "url": "git+https://github.com/karmaniverous/jeeves-watcher.git"
   },
   "scripts": {
-    "build": "npm run generate:schema && rimraf dist && cross-env NO_COLOR=1 rollup --config rollup.config.ts --configPlugin @rollup/plugin-typescript",
+    "build": "npm run generate:schema && rimraf dist && cross-env NO_COLOR=1 rollup --config rollup.config.ts --configPlugin \"@rollup/plugin-typescript={paths:{}}\"",
     "changelog": "git-cliff -o CHANGELOG.md",
     "diagrams": "cd diagrams && plantuml -tpng -o ../assets -r .",
     "generate:schema": "tsx src/config/generate-schema.ts",
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
     "release": "dotenvx run -f .env.local -- release-it",
-    "release:pre": "dotenvx run -f .env.local -- release-it --no-git.requireBranch --github.prerelease --preRelease",
+    "release:pre": "dotenvx run -f .env.local -- release-it --no-git.requireBranch --github.preRelease --preRelease",
     "test": "vitest run",
     "typecheck": "tsc"
   },
   "type": "module",
   "types": "dist/index.d.ts",
-  "version": "0.18.12"
+  "version": "0.19.0-1"
 }