@karmaniverous/jeeves-watcher 0.18.3 → 0.18.5

package/dist/cli/jeeves-watcher/{index-Dk_WrV0T.js → index-CaibsSrT.js}

@@ -10,7 +10,7 @@ import Ajv from 'ajv';
 import addFormats from 'ajv-formats';
 import picomatch from 'picomatch';
 import { deserialize, serialize } from 'node:v8';
-import { normalizeWatchPaths, extractWatchPathStrings, inferenceRuleSchema, jeevesWatcherConfigSchema } from '@karmaniverous/jeeves-watcher-core';
+import { normalizeWatchPaths, extractWatchPathStrings, vcsAuthorConfigSchema, inferenceRuleSchema, jeevesWatcherConfigSchema } from '@karmaniverous/jeeves-watcher-core';
 import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
 import { homedir } from 'node:os';
@@ -934,17 +934,32 @@ class CommitMessageGenerator {
  */
 /** Promisified execFile for git commands. */
 const execFileAsync = promisify(execFile);
+/**
+ * Normalize a path for case-insensitive comparison on Windows.
+ * On Windows, lowercases the entire path; on other platforms, returns as-is.
+ *
+ * @param p - The path string to normalize.
+ * @param platform - The platform to check against (default: `process.platform`).
+ * @returns The normalized path.
+ */
+function normalizePathCase(p, platform = process.platform) {
+    return platform === 'win32' ? p.toLowerCase() : p;
+}
 /**
  * Find the longest-prefix-match root for a normalized path.
  * Roots must be sorted longest-first for correct nested matching.
  *
  * @param roots - Root paths sorted longest-first.
  * @param normalizedPath - Normalized absolute path (forward slashes).
+ * @param platform - The platform to check against (default: `process.platform`).
  * @returns The matching root, or undefined.
  */
-function findRootForPath(roots, normalizedPath) {
+function findRootForPath(roots, normalizedPath, platform = process.platform) {
+    const comparePath = normalizePathCase(normalizedPath, platform);
     for (const root of roots) {
-        if (normalizedPath === root || normalizedPath.startsWith(root + '/')) {
+        const compareRoot = normalizePathCase(root, platform);
+        if (comparePath === compareRoot ||
+            comparePath.startsWith(compareRoot + '/')) {
             return root;
         }
     }
@@ -1303,6 +1318,7 @@ class VcsManager {
     debounceTimer;
     commitInFlight = Promise.resolve();
     started = false;
+    isBaseline = false;
     _lastPushTime = null;
     constructor(rootPath, config, logger, commitMessageGenerator, remoteUrl, accessToken) {
         this.rootPath = rootPath;
@@ -1323,11 +1339,47 @@ class VcsManager {
     }
     /**
      * Begin accepting file changes. Sets up the debounce mechanism.
+     * Enqueues a baseline commit for pre-existing files if the repo has no commits.
      */
-    start() {
+    async start() {
         this.started = true;
         this.squashManager?.start();
         this.logger.info({ root: this.rootPath }, 'VcsManager started');
+        await this.enqueueBaselineIfNeeded();
+    }
+    /**
+     * If the repo has no commits, enumerate untracked files and feed them
+     * through fileChanged() to create a baseline commit.
+     */
+    async enqueueBaselineIfNeeded() {
+        try {
+            await execFileAsync('git', ['rev-parse', 'HEAD'], {
+                cwd: this.rootPath,
+            });
+            // HEAD exists — repo already has commits
+            return;
+        }
+        catch {
+            // No commits yet — proceed with baseline
+        }
+        try {
+            const { stdout } = await execFileAsync('git', ['ls-files', '--others', '--exclude-standard', '-z'], { cwd: this.rootPath });
+            const files = stdout
+                .split('\0')
+                .map((line) => line.trim())
+                .filter((line) => line.length > 0);
+            if (files.length === 0)
+                return;
+            this.logger.info({ root: this.rootPath, fileCount: files.length }, 'Enqueuing baseline commit for pre-existing files');
+            this.isBaseline = true;
+            const absolutePaths = files.map((f) => this.rootPath + '/' + f);
+            for (const filePath of absolutePaths) {
+                this.fileChanged(filePath);
+            }
+        }
+        catch (error) {
+            this.logger.warn({ root: this.rootPath, err: normalizeError(error) }, 'Failed to enumerate untracked files for baseline commit');
+        }
     }
     /**
      * Add a file to the pending set and reset the debounce timer.
@@ -1442,6 +1494,9 @@ class VcsManager {
      */
     buildTemplateMessage(fileCount) {
         if (this.pendingReversions.length === 0) {
+            if (this.isBaseline) {
+                return `baseline: batch (${String(fileCount)} files)`;
+            }
             const timestamp = new Date().toISOString();
             return `watcher: batch ${timestamp} (${String(fileCount)} files)`;
         }
@@ -1499,10 +1554,15 @@ class VcsManager {
                     cwd: this.rootPath,
                 });
                 // Build message after staging so getStagedDiff can see the changes
-                const message = attempt === 1
-                    ? await this.buildCommitMessage(files)
-                    : this.buildTemplateMessage(files.length);
+                // Skip AI for baselines and retries — use template directly
+                const message = this.isBaseline || attempt > 1
+                    ? this.buildTemplateMessage(files.length)
+                    : await this.buildCommitMessage(files);
                 this.pendingReversions.length = 0;
+                // Only clear baseline flag when all baseline files have been committed
+                if (this.pending.size === 0) {
+                    this.isBaseline = false;
+                }
                 await execFileAsync('git', ['commit', '-m', message], {
                     cwd: this.rootPath,
                 });
@@ -1579,8 +1639,9 @@ class VcsCoordinator {
             if (!rootVcs)
                 continue;
             const resolvedRoot = normalizeSlashes(resolve(globRoot(entry.path)));
+            const rootKey = normalizePathCase(resolvedRoot);
             // Deduplicate: skip if another glob already resolved to this root.
-            if (this.managers.has(resolvedRoot))
+            if (this.managers.has(rootKey))
                 continue;
             const mergedConfig = {
                 ...config.vcs,
@@ -1600,7 +1661,7 @@ class VcsCoordinator {
             const remoteUrl = entry.vcs?.remote;
             const accessToken = entry.vcs?.accessToken ?? config.vcs.defaultAccessToken;
             const manager = new VcsManager(resolvedRoot, mergedConfig, logger.child({ vcsRoot: resolvedRoot }), generator, remoteUrl, accessToken);
-            this.managers.set(resolvedRoot, manager);
+            this.managers.set(rootKey, manager);
             this.roots.push(resolvedRoot);
         }
         // Sort roots longest-first so nested paths match before parents.
@@ -1609,10 +1670,12 @@ class VcsCoordinator {
     /**
      * Start all VcsManager instances.
      */
-    start() {
+    async start() {
+        const startPromises = [];
         this.managers.forEach((manager) => {
-            manager.start();
+            startPromises.push(manager.start());
         });
+        await Promise.all(startPromises);
         this.logger.info({ rootCount: this.managers.size }, 'VcsCoordinator started');
     }
     /**
@@ -1654,7 +1717,7 @@ class VcsCoordinator {
      * Get the VcsManager for a specific root path.
      */
     getManager(root) {
-        return this.managers.get(root);
+        return this.managers.get(normalizePathCase(root));
     }
     /**
      * Get all managers as [root, manager] pairs.
@@ -1671,7 +1734,7 @@ class VcsCoordinator {
      */
     findManagerForPath(normalizedPath) {
         const root = findRootForPath(this.roots, normalizedPath);
-        return root ? this.managers.get(root) : undefined;
+        return root ? this.managers.get(normalizePathCase(root)) : undefined;
     }
 }
 
@@ -2892,15 +2955,18 @@ function resolveWatchRootsForGlob(coordinator, glob) {
     const normalizedGlob = normalizeSlashes(glob);
     const roots = coordinator.getRoots();
     const results = [];
+    const compareGlob = normalizePathCase(normalizedGlob);
     for (const root of roots) {
-        if (normalizedGlob.startsWith(root + '/') || normalizedGlob === root) {
+        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 (root.startsWith(normalizedGlob.replace(/[*?[\]{}]/g, ''))) {
+        else if (compareRoot.startsWith(compareGlob.replace(/[*?[\]{}]/g, ''))) {
             // Root is under the glob's base path — include with root-relative glob
             results.push({
                 root,
@@ -2986,6 +3052,22 @@ async function initRepo(rootPath) {
         await execFileAsync('git', ['init'], { cwd: rootPath });
     }
 }
+/**
+ * Configure local git identity for a repository.
+ * Sets repo-level (not global) user.name and user.email.
+ *
+ * @param rootPath - Directory of the git repository.
+ * @param name - Author name for commits.
+ * @param email - Author email for commits.
+ */
+async function configureRepoIdentity(rootPath, name, email) {
+    await execFileAsync('git', ['config', '--local', 'user.name', name], {
+        cwd: rootPath,
+    });
+    await execFileAsync('git', ['config', '--local', 'user.email', email], {
+        cwd: rootPath,
+    });
+}
 /**
  * Ensure a .gitignore file exists at rootPath with all always-on entries.
  * Creates the file if missing. Appends only entries not already present.
@@ -3200,7 +3282,15 @@ async function initVcs(config, logger) {
         initializedRoots.add(root);
         await initRepo(root);
         await ensureGitignore(root);
+        // Resolve author identity: per-path → root-level → schema defaults.
+        const defaults = vcsAuthorConfigSchema.parse({});
+        const pathAuthor = entry.vcs?.author;
+        const rootAuthor = config.vcs.author;
+        const authorName = pathAuthor?.name ?? rootAuthor?.name ?? defaults.name;
+        const authorEmail = pathAuthor?.email ?? rootAuthor?.email ?? defaults.email;
+        await configureRepoIdentity(root, authorName, authorEmail);
         logger.info({ root }, 'VCS initialized for watch root');
+        logger.debug({ root, authorName, authorEmail }, 'VCS author identity configured');
     }
     return true;
 }
@@ -7694,7 +7784,7 @@ class JeevesWatcher {
         this.watcher = watcher;
         this.gitignoreFilter = gitignoreFilter;
         this.server = await this.startApiServer();
-        vcsCoordinator.start();
+        await vcsCoordinator.start();
         this.watcher.start();
         this.startConfigWatch();
         logger.info('jeeves-watcher started');

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

@@ -224,7 +224,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-Dk_WrV0T.js');
+    const { JeevesWatcher } = await import('./index-CaibsSrT.js');
     const app = new JeevesWatcher(config, resolvedPath, descriptor);
     installShutdownHandlers(() => app.stop());
     await app.start();

package/dist/index.d.ts

@@ -1291,14 +1291,21 @@ declare class VcsManager {
     private debounceTimer;
     private commitInFlight;
     private started;
+    private isBaseline;
     private _lastPushTime;
     constructor(rootPath: string, config: VcsConfig, logger: pino.Logger, commitMessageGenerator?: CommitMessageGenerator, remoteUrl?: string, accessToken?: string);
     get lastPushTime(): string | null;
     get pushErrors(): readonly PushError[];
     /**
      * Begin accepting file changes. Sets up the debounce mechanism.
+     * Enqueues a baseline commit for pre-existing files if the repo has no commits.
      */
-    start(): void;
+    start(): Promise<void>;
+    /**
+     * If the repo has no commits, enumerate untracked files and feed them
+     * through fileChanged() to create a baseline commit.
+     */
+    private enqueueBaselineIfNeeded;
     /**
      * Add a file to the pending set and reset the debounce timer.
      * If the pending set exceeds maxBatchSize, flush immediately.
@@ -1379,7 +1386,7 @@ declare class VcsCoordinator {
     /**
      * Start all VcsManager instances.
      */
-    start(): void;
+    start(): Promise<void>;
     /**
      * Route a file event to the correct root's VcsManager.
      *

package/dist/index.js

@@ -1,6 +1,6 @@
 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 { extractWatchPathStrings, inferenceRuleSchema, jeevesWatcherConfigSchema, normalizeWatchPaths, 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';
+import { extractWatchPathStrings, inferenceRuleSchema, jeevesWatcherConfigSchema, normalizeWatchPaths, vcsAuthorConfigSchema, 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';
 import { readdir, stat, readFile, writeFile, mkdir, appendFile, access, rm } from 'node:fs/promises';
@@ -3375,17 +3375,32 @@ function createSearchHandler(deps) {
  */
 /** Promisified execFile for git commands. */
 const execFileAsync = promisify(execFile);
+/**
+ * Normalize a path for case-insensitive comparison on Windows.
+ * On Windows, lowercases the entire path; on other platforms, returns as-is.
+ *
+ * @param p - The path string to normalize.
+ * @param platform - The platform to check against (default: `process.platform`).
+ * @returns The normalized path.
+ */
+function normalizePathCase(p, platform = process.platform) {
+    return platform === 'win32' ? p.toLowerCase() : p;
+}
 /**
  * Find the longest-prefix-match root for a normalized path.
  * Roots must be sorted longest-first for correct nested matching.
  *
  * @param roots - Root paths sorted longest-first.
  * @param normalizedPath - Normalized absolute path (forward slashes).
+ * @param platform - The platform to check against (default: `process.platform`).
  * @returns The matching root, or undefined.
  */
-function findRootForPath(roots, normalizedPath) {
+function findRootForPath(roots, normalizedPath, platform = process.platform) {
+    const comparePath = normalizePathCase(normalizedPath, platform);
     for (const root of roots) {
-        if (normalizedPath === root || normalizedPath.startsWith(root + '/')) {
+        const compareRoot = normalizePathCase(root, platform);
+        if (comparePath === compareRoot ||
+            comparePath.startsWith(compareRoot + '/')) {
             return root;
         }
     }
@@ -3425,15 +3440,18 @@ function resolveWatchRootsForGlob(coordinator, glob) {
     const normalizedGlob = normalizeSlashes(glob);
     const roots = coordinator.getRoots();
     const results = [];
+    const compareGlob = normalizePathCase(normalizedGlob);
     for (const root of roots) {
-        if (normalizedGlob.startsWith(root + '/') || normalizedGlob === root) {
+        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 (root.startsWith(normalizedGlob.replace(/[*?[\]{}]/g, ''))) {
+        else if (compareRoot.startsWith(compareGlob.replace(/[*?[\]{}]/g, ''))) {
             // Root is under the glob's base path — include with root-relative glob
             results.push({
                 root,
@@ -4624,6 +4642,22 @@ async function initRepo(rootPath) {
         await execFileAsync('git', ['init'], { cwd: rootPath });
     }
 }
+/**
+ * Configure local git identity for a repository.
+ * Sets repo-level (not global) user.name and user.email.
+ *
+ * @param rootPath - Directory of the git repository.
+ * @param name - Author name for commits.
+ * @param email - Author email for commits.
+ */
+async function configureRepoIdentity(rootPath, name, email) {
+    await execFileAsync('git', ['config', '--local', 'user.name', name], {
+        cwd: rootPath,
+    });
+    await execFileAsync('git', ['config', '--local', 'user.email', email], {
+        cwd: rootPath,
+    });
+}
 /**
  * Ensure a .gitignore file exists at rootPath with all always-on entries.
  * Creates the file if missing. Appends only entries not already present.
@@ -4780,6 +4814,7 @@ class VcsManager {
     debounceTimer;
     commitInFlight = Promise.resolve();
     started = false;
+    isBaseline = false;
     _lastPushTime = null;
     constructor(rootPath, config, logger, commitMessageGenerator, remoteUrl, accessToken) {
         this.rootPath = rootPath;
@@ -4800,11 +4835,47 @@ class VcsManager {
     }
     /**
      * Begin accepting file changes. Sets up the debounce mechanism.
+     * Enqueues a baseline commit for pre-existing files if the repo has no commits.
      */
-    start() {
+    async start() {
         this.started = true;
         this.squashManager?.start();
         this.logger.info({ root: this.rootPath }, 'VcsManager started');
+        await this.enqueueBaselineIfNeeded();
+    }
+    /**
+     * If the repo has no commits, enumerate untracked files and feed them
+     * through fileChanged() to create a baseline commit.
+     */
+    async enqueueBaselineIfNeeded() {
+        try {
+            await execFileAsync('git', ['rev-parse', 'HEAD'], {
+                cwd: this.rootPath,
+            });
+            // HEAD exists — repo already has commits
+            return;
+        }
+        catch {
+            // No commits yet — proceed with baseline
+        }
+        try {
+            const { stdout } = await execFileAsync('git', ['ls-files', '--others', '--exclude-standard', '-z'], { cwd: this.rootPath });
+            const files = stdout
+                .split('\0')
+                .map((line) => line.trim())
+                .filter((line) => line.length > 0);
+            if (files.length === 0)
+                return;
+            this.logger.info({ root: this.rootPath, fileCount: files.length }, 'Enqueuing baseline commit for pre-existing files');
+            this.isBaseline = true;
+            const absolutePaths = files.map((f) => this.rootPath + '/' + f);
+            for (const filePath of absolutePaths) {
+                this.fileChanged(filePath);
+            }
+        }
+        catch (error) {
+            this.logger.warn({ root: this.rootPath, err: normalizeError(error) }, 'Failed to enumerate untracked files for baseline commit');
+        }
     }
     /**
      * Add a file to the pending set and reset the debounce timer.
@@ -4919,6 +4990,9 @@ class VcsManager {
      */
     buildTemplateMessage(fileCount) {
         if (this.pendingReversions.length === 0) {
+            if (this.isBaseline) {
+                return `baseline: batch (${String(fileCount)} files)`;
+            }
             const timestamp = new Date().toISOString();
             return `watcher: batch ${timestamp} (${String(fileCount)} files)`;
         }
@@ -4976,10 +5050,15 @@ class VcsManager {
                     cwd: this.rootPath,
                 });
                 // Build message after staging so getStagedDiff can see the changes
-                const message = attempt === 1
-                    ? await this.buildCommitMessage(files)
-                    : this.buildTemplateMessage(files.length);
+                // Skip AI for baselines and retries — use template directly
+                const message = this.isBaseline || attempt > 1
+                    ? this.buildTemplateMessage(files.length)
+                    : await this.buildCommitMessage(files);
                 this.pendingReversions.length = 0;
+                // Only clear baseline flag when all baseline files have been committed
+                if (this.pending.size === 0) {
+                    this.isBaseline = false;
+                }
                 await execFileAsync('git', ['commit', '-m', message], {
                     cwd: this.rootPath,
                 });
@@ -5056,8 +5135,9 @@ class VcsCoordinator {
             if (!rootVcs)
                 continue;
             const resolvedRoot = normalizeSlashes(resolve(globRoot(entry.path)));
+            const rootKey = normalizePathCase(resolvedRoot);
             // Deduplicate: skip if another glob already resolved to this root.
-            if (this.managers.has(resolvedRoot))
+            if (this.managers.has(rootKey))
                 continue;
             const mergedConfig = {
                 ...config.vcs,
@@ -5077,7 +5157,7 @@ class VcsCoordinator {
             const remoteUrl = entry.vcs?.remote;
             const accessToken = entry.vcs?.accessToken ?? config.vcs.defaultAccessToken;
             const manager = new VcsManager(resolvedRoot, mergedConfig, logger.child({ vcsRoot: resolvedRoot }), generator, remoteUrl, accessToken);
-            this.managers.set(resolvedRoot, manager);
+            this.managers.set(rootKey, manager);
             this.roots.push(resolvedRoot);
         }
         // Sort roots longest-first so nested paths match before parents.
@@ -5086,10 +5166,12 @@ class VcsCoordinator {
     /**
      * Start all VcsManager instances.
      */
-    start() {
+    async start() {
+        const startPromises = [];
         this.managers.forEach((manager) => {
-            manager.start();
+            startPromises.push(manager.start());
         });
+        await Promise.all(startPromises);
         this.logger.info({ rootCount: this.managers.size }, 'VcsCoordinator started');
     }
     /**
@@ -5131,7 +5213,7 @@ class VcsCoordinator {
      * Get the VcsManager for a specific root path.
      */
     getManager(root) {
-        return this.managers.get(root);
+        return this.managers.get(normalizePathCase(root));
     }
     /**
      * Get all managers as [root, manager] pairs.
@@ -5148,7 +5230,7 @@ class VcsCoordinator {
      */
     findManagerForPath(normalizedPath) {
         const root = findRootForPath(this.roots, normalizedPath);
-        return root ? this.managers.get(root) : undefined;
+        return root ? this.managers.get(normalizePathCase(root)) : undefined;
     }
 }
 
@@ -5336,7 +5418,15 @@ async function initVcs(config, logger) {
         initializedRoots.add(root);
         await initRepo(root);
         await ensureGitignore(root);
+        // Resolve author identity: per-path → root-level → schema defaults.
+        const defaults = vcsAuthorConfigSchema.parse({});
+        const pathAuthor = entry.vcs?.author;
+        const rootAuthor = config.vcs.author;
+        const authorName = pathAuthor?.name ?? rootAuthor?.name ?? defaults.name;
+        const authorEmail = pathAuthor?.email ?? rootAuthor?.email ?? defaults.email;
+        await configureRepoIdentity(root, authorName, authorEmail);
         logger.info({ root }, 'VCS initialized for watch root');
+        logger.debug({ root, authorName, authorEmail }, 'VCS author identity configured');
     }
     return true;
 }
@@ -8845,7 +8935,7 @@ class JeevesWatcher {
         this.watcher = watcher;
         this.gitignoreFilter = gitignoreFilter;
         this.server = await this.startApiServer();
-        vcsCoordinator.start();
+        await vcsCoordinator.start();
         this.watcher.start();
         this.startConfigWatch();
         logger.info('jeeves-watcher started');

package/package.json

@@ -9,7 +9,7 @@
   "dependencies": {
     "@commander-js/extra-typings": "^14.0.0",
     "@karmaniverous/jeeves": "^0.5.12",
-    "@karmaniverous/jeeves-watcher-core": "^0.2.1",
+    "@karmaniverous/jeeves-watcher-core": "^0.2.2",
     "@karmaniverous/jsonmap": "^2.1.1",
     "@langchain/textsplitters": "*",
     "@qdrant/js-client-rest": "*",
@@ -149,5 +149,5 @@
   },
   "type": "module",
   "types": "dist/index.d.ts",
-  "version": "0.18.3"
+  "version": "0.18.5"
 }