watchfix 0.2.2 → 0.4.0

package/dist/cli/commands/fix.js

@@ -152,7 +152,7 @@ const formatStatusLine = (result, maxAttempts) => {
         return 'Status: resolved (issue already fixed)';
     }
     const retryInfo = result.attempts < maxAttempts ? ', will retry' : ', max attempts reached';
-    return `Status: ${result.status} (attempt ${result.attempts} of ${maxAttempts}${retryInfo})`;
+    return `Status: ${result.status} (attempt ${result.attempts + 1} of ${maxAttempts}${retryInfo})`;
 };
 const formatFixOutcome = (result, verbosity, maxAttempts) => {
     if (verbosity === 'quiet') {
@@ -211,7 +211,7 @@ const checkDaemonConflict = (db, logger) => {
     if (!state) {
         return true;
     }
-    if (!isOurProcess(state.pid, state.project_root)) {
+    if (!isOurProcess(state.pid)) {
         clearWatcherState(db);
         return true;
     }

package/dist/cli/commands/init.js

@@ -27,6 +27,19 @@ logs:
       type: file
       path: ./logs/app.log
 
+  # Example NDJSON source (for structured JSON logs like Pino, Bunyan, Winston):
+  # - name: app-json
+  #   type: file
+  #   path: ./logs/app.ndjson
+  #   format: ndjson
+  #   ndjson:
+  #     messageField: msg           # Required: field containing log message
+  #     timestampField: time        # Optional: field with timestamp
+  #     levelField: level           # Optional: field with log level
+  #     levelFilter:                # Optional: only process these levels
+  #       - error
+  #       - fatal
+
   # Example docker source:
   # - name: api
   #   type: docker

package/dist/cli/commands/show.js

@@ -56,6 +56,9 @@ const formatAnalysis = (analysis) => {
         return ['Analysis (raw):', `  ${analysis}`];
     }
     const lines = ['Analysis:'];
+    if (analysis.category) {
+        lines.push(`  Category: ${analysis.category}`);
+    }
     if (analysis.summary) {
         lines.push(`  Summary: ${analysis.summary}`);
     }
@@ -73,6 +76,10 @@ const formatAnalysis = (analysis) => {
             lines.push(`    - ${file}`);
         }
     }
+    if (analysis.remediation_guidance) {
+        lines.push('  Remediation guidance:');
+        lines.push(...analysis.remediation_guidance.split('\n').map((line) => `    ${line}`));
+    }
     if (analysis.confidence) {
         lines.push(`  Confidence: ${analysis.confidence}`);
     }

package/dist/cli/commands/status.js

@@ -13,6 +13,7 @@ const STATUS_ORDER = [
     'fixed',
     'failed',
     'ignored',
+    'deferred',
 ];
 const buildDatabasePath = (rootDir) => path.join(rootDir, '.watchfix', 'errors.db');
 const getWatcherState = (db) => db.get('SELECT pid, started_at, autonomous, project_root, command_line FROM watcher_state WHERE id = 1');
@@ -62,6 +63,16 @@ const formatActionableErrors = (errors) => {
     }
     return lines;
 };
+const formatDeferredErrors = (errors) => {
+    if (errors.length === 0) {
+        return ['Deferred errors: none'];
+    }
+    const lines = ['Deferred errors (manual action required):'];
+    for (const error of errors) {
+        lines.push(`  #${error.id} ${error.errorType} (${error.source}): ${error.message}`);
+    }
+    return lines;
+};
 export const statusCommand = async (options) => {
     const config = loadConfig(options.config);
     const dbPath = buildDatabasePath(config.project.root);
@@ -71,6 +82,7 @@ export const statusCommand = async (options) => {
             'Errors:',
             ...STATUS_ORDER.map((status) => `  ${status}: 0`),
             'Actionable errors: none',
+            'Deferred errors: none',
         ];
         process.stdout.write(`${lines.join('\n')}\n`);
         return;
@@ -81,7 +93,7 @@ export const statusCommand = async (options) => {
         checkSchemaVersion(db);
         const lines = [];
         const state = getWatcherState(db);
-        if (state && isOurProcess(state.pid, state.project_root)) {
+        if (state && isOurProcess(state.pid)) {
             const mode = state.autonomous ? 'autonomous' : 'manual';
             const uptime = formatUptime(state.started_at);
             lines.push(`Watcher: running (pid ${state.pid}, ${mode} mode, uptime ${uptime}).`);
@@ -102,6 +114,8 @@ export const statusCommand = async (options) => {
         }
         const actionable = getErrorsByStatus(db, ['pending', 'suggested']);
         lines.push(...formatActionableErrors(actionable));
+        const deferred = getErrorsByStatus(db, ['deferred']);
+        lines.push(...formatDeferredErrors(deferred));
         process.stdout.write(`${lines.join('\n')}\n`);
     }
     finally {

package/dist/cli/commands/stop.js

@@ -58,7 +58,7 @@ export const stopCommand = async (options) => {
             process.exitCode = EXIT_CODES.WATCHER_CONFLICT;
             return;
         }
-        if (!isOurProcess(state.pid, state.project_root)) {
+        if (!isOurProcess(state.pid)) {
             process.stdout.write('Stale watcher state (process no longer exists).\n');
             clearWatcherState(db);
             process.exitCode = EXIT_CODES.WATCHER_CONFLICT;

package/dist/cli/commands/watch.js

@@ -31,7 +31,7 @@ const ensureWatcherAvailable = (db, projectRoot, logger) => {
     if (!existing) {
         return true;
     }
-    if (isOurProcess(existing.pid, projectRoot)) {
+    if (isOurProcess(existing.pid)) {
         const mode = existing.autonomous ? 'autonomous' : 'manual';
         const message = `Watcher already running (pid ${existing.pid}, ${mode} mode). Use 'watchfix stop'.`;
         if (logger) {

package/dist/config/schema.d.ts

@@ -1,29 +1,76 @@
 import { z } from 'zod';
 declare const durationSchema: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>;
+declare const ndjsonConfigSchema: z.ZodObject<{
+    messageField: z.ZodString;
+    timestampField: z.ZodOptional<z.ZodString>;
+    levelField: z.ZodOptional<z.ZodString>;
+    levelFilter: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+}, "strip", z.ZodTypeAny, {
+    messageField: string;
+    timestampField?: string | undefined;
+    levelField?: string | undefined;
+    levelFilter?: string[] | undefined;
+}, {
+    messageField: string;
+    timestampField?: string | undefined;
+    levelField?: string | undefined;
+    levelFilter?: string[] | undefined;
+}>;
 declare const fileSourceSchema: z.ZodObject<{
     name: z.ZodString;
     type: z.ZodLiteral<"file">;
     path: z.ZodString;
+    format: z.ZodOptional<z.ZodEnum<["text", "ndjson"]>>;
+    ndjson: z.ZodOptional<z.ZodObject<{
+        messageField: z.ZodString;
+        timestampField: z.ZodOptional<z.ZodString>;
+        levelField: z.ZodOptional<z.ZodString>;
+        levelFilter: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    }, "strip", z.ZodTypeAny, {
+        messageField: string;
+        timestampField?: string | undefined;
+        levelField?: string | undefined;
+        levelFilter?: string[] | undefined;
+    }, {
+        messageField: string;
+        timestampField?: string | undefined;
+        levelField?: string | undefined;
+        levelFilter?: string[] | undefined;
+    }>>;
 }, "strip", z.ZodTypeAny, {
     path: string;
-    name: string;
     type: "file";
+    name: string;
+    ndjson?: {
+        messageField: string;
+        timestampField?: string | undefined;
+        levelField?: string | undefined;
+        levelFilter?: string[] | undefined;
+    } | undefined;
+    format?: "text" | "ndjson" | undefined;
 }, {
     path: string;
-    name: string;
     type: "file";
+    name: string;
+    ndjson?: {
+        messageField: string;
+        timestampField?: string | undefined;
+        levelField?: string | undefined;
+        levelFilter?: string[] | undefined;
+    } | undefined;
+    format?: "text" | "ndjson" | undefined;
 }>;
 declare const dockerSourceSchema: z.ZodObject<{
     name: z.ZodString;
     type: z.ZodLiteral<"docker">;
     container: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    name: string;
     type: "docker";
+    name: string;
     container: string;
 }, {
-    name: string;
     type: "docker";
+    name: string;
     container: string;
 }>;
 declare const commandSourceSchema: z.ZodObject<{
@@ -32,13 +79,13 @@ declare const commandSourceSchema: z.ZodObject<{
     run: z.ZodString;
     interval: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>;
 }, "strip", z.ZodTypeAny, {
-    name: string;
     type: "command";
+    name: string;
     run: string;
     interval: string;
 }, {
-    name: string;
     type: "command";
+    name: string;
     run: string;
     interval: string;
 }>;
@@ -46,25 +93,56 @@ declare const logSourceSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
     name: z.ZodString;
     type: z.ZodLiteral<"file">;
     path: z.ZodString;
+    format: z.ZodOptional<z.ZodEnum<["text", "ndjson"]>>;
+    ndjson: z.ZodOptional<z.ZodObject<{
+        messageField: z.ZodString;
+        timestampField: z.ZodOptional<z.ZodString>;
+        levelField: z.ZodOptional<z.ZodString>;
+        levelFilter: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    }, "strip", z.ZodTypeAny, {
+        messageField: string;
+        timestampField?: string | undefined;
+        levelField?: string | undefined;
+        levelFilter?: string[] | undefined;
+    }, {
+        messageField: string;
+        timestampField?: string | undefined;
+        levelField?: string | undefined;
+        levelFilter?: string[] | undefined;
+    }>>;
 }, "strip", z.ZodTypeAny, {
     path: string;
-    name: string;
     type: "file";
+    name: string;
+    ndjson?: {
+        messageField: string;
+        timestampField?: string | undefined;
+        levelField?: string | undefined;
+        levelFilter?: string[] | undefined;
+    } | undefined;
+    format?: "text" | "ndjson" | undefined;
 }, {
     path: string;
-    name: string;
     type: "file";
+    name: string;
+    ndjson?: {
+        messageField: string;
+        timestampField?: string | undefined;
+        levelField?: string | undefined;
+        levelFilter?: string[] | undefined;
+    } | undefined;
+    format?: "text" | "ndjson" | undefined;
 }>, z.ZodObject<{
     name: z.ZodString;
     type: z.ZodLiteral<"docker">;
     container: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    name: string;
     type: "docker";
+    name: string;
     container: string;
 }, {
-    name: string;
     type: "docker";
+    name: string;
     container: string;
 }>, z.ZodObject<{
     name: z.ZodString;
@@ -72,13 +150,13 @@ declare const logSourceSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
     run: z.ZodString;
     interval: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>;
 }, "strip", z.ZodTypeAny, {
-    name: string;
     type: "command";
+    name: string;
     run: string;
     interval: string;
 }, {
-    name: string;
     type: "command";
+    name: string;
     run: string;
     interval: string;
 }>]>;
@@ -117,29 +195,60 @@ declare const configSchema: z.ZodObject<{
         stderr_is_progress?: boolean | undefined;
     }>;
     logs: z.ZodObject<{
-        sources: z.ZodEffects<z.ZodArray<z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
+        sources: z.ZodEffects<z.ZodEffects<z.ZodArray<z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
             name: z.ZodString;
             type: z.ZodLiteral<"file">;
             path: z.ZodString;
+            format: z.ZodOptional<z.ZodEnum<["text", "ndjson"]>>;
+            ndjson: z.ZodOptional<z.ZodObject<{
+                messageField: z.ZodString;
+                timestampField: z.ZodOptional<z.ZodString>;
+                levelField: z.ZodOptional<z.ZodString>;
+                levelFilter: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+            }, "strip", z.ZodTypeAny, {
+                messageField: string;
+                timestampField?: string | undefined;
+                levelField?: string | undefined;
+                levelFilter?: string[] | undefined;
+            }, {
+                messageField: string;
+                timestampField?: string | undefined;
+                levelField?: string | undefined;
+                levelFilter?: string[] | undefined;
+            }>>;
         }, "strip", z.ZodTypeAny, {
             path: string;
-            name: string;
             type: "file";
+            name: string;
+            ndjson?: {
+                messageField: string;
+                timestampField?: string | undefined;
+                levelField?: string | undefined;
+                levelFilter?: string[] | undefined;
+            } | undefined;
+            format?: "text" | "ndjson" | undefined;
         }, {
             path: string;
-            name: string;
             type: "file";
+            name: string;
+            ndjson?: {
+                messageField: string;
+                timestampField?: string | undefined;
+                levelField?: string | undefined;
+                levelFilter?: string[] | undefined;
+            } | undefined;
+            format?: "text" | "ndjson" | undefined;
         }>, z.ZodObject<{
             name: z.ZodString;
             type: z.ZodLiteral<"docker">;
             container: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            name: string;
             type: "docker";
+            name: string;
             container: string;
         }, {
-            name: string;
             type: "docker";
+            name: string;
             container: string;
         }>, z.ZodObject<{
             name: z.ZodString;
@@ -147,39 +256,93 @@ declare const configSchema: z.ZodObject<{
             run: z.ZodString;
             interval: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>;
         }, "strip", z.ZodTypeAny, {
-            name: string;
             type: "command";
+            name: string;
             run: string;
             interval: string;
         }, {
-            name: string;
             type: "command";
+            name: string;
             run: string;
             interval: string;
         }>]>, "many">, ({
             path: string;
-            name: string;
             type: "file";
-        } | {
             name: string;
+            ndjson?: {
+                messageField: string;
+                timestampField?: string | undefined;
+                levelField?: string | undefined;
+                levelFilter?: string[] | undefined;
+            } | undefined;
+            format?: "text" | "ndjson" | undefined;
+        } | {
             type: "docker";
+            name: string;
             container: string;
         } | {
-            name: string;
             type: "command";
+            name: string;
             run: string;
             interval: string;
         })[], ({
             path: string;
-            name: string;
             type: "file";
+            name: string;
+            ndjson?: {
+                messageField: string;
+                timestampField?: string | undefined;
+                levelField?: string | undefined;
+                levelFilter?: string[] | undefined;
+            } | undefined;
+            format?: "text" | "ndjson" | undefined;
+        } | {
+            type: "docker";
+            name: string;
+            container: string;
         } | {
+            type: "command";
+            name: string;
+            run: string;
+            interval: string;
+        })[]>, ({
+            path: string;
+            type: "file";
             name: string;
+            ndjson?: {
+                messageField: string;
+                timestampField?: string | undefined;
+                levelField?: string | undefined;
+                levelFilter?: string[] | undefined;
+            } | undefined;
+            format?: "text" | "ndjson" | undefined;
+        } | {
             type: "docker";
+            name: string;
             container: string;
         } | {
+            type: "command";
             name: string;
+            run: string;
+            interval: string;
+        })[], ({
+            path: string;
+            type: "file";
+            name: string;
+            ndjson?: {
+                messageField: string;
+                timestampField?: string | undefined;
+                levelField?: string | undefined;
+                levelFilter?: string[] | undefined;
+            } | undefined;
+            format?: "text" | "ndjson" | undefined;
+        } | {
+            type: "docker";
+            name: string;
+            container: string;
+        } | {
             type: "command";
+            name: string;
             run: string;
             interval: string;
         })[]>;
@@ -189,15 +352,22 @@ declare const configSchema: z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         sources: ({
             path: string;
-            name: string;
             type: "file";
-        } | {
             name: string;
+            ndjson?: {
+                messageField: string;
+                timestampField?: string | undefined;
+                levelField?: string | undefined;
+                levelFilter?: string[] | undefined;
+            } | undefined;
+            format?: "text" | "ndjson" | undefined;
+        } | {
             type: "docker";
+            name: string;
             container: string;
         } | {
-            name: string;
             type: "command";
+            name: string;
             run: string;
             interval: string;
         })[];
@@ -207,15 +377,22 @@ declare const configSchema: z.ZodObject<{
     }, {
         sources: ({
             path: string;
-            name: string;
             type: "file";
-        } | {
             name: string;
+            ndjson?: {
+                messageField: string;
+                timestampField?: string | undefined;
+                levelField?: string | undefined;
+                levelFilter?: string[] | undefined;
+            } | undefined;
+            format?: "text" | "ndjson" | undefined;
+        } | {
             type: "docker";
+            name: string;
             container: string;
         } | {
-            name: string;
             type: "command";
+            name: string;
             run: string;
             interval: string;
         })[];
@@ -261,10 +438,13 @@ declare const configSchema: z.ZodObject<{
     }>>;
     deduplication: z.ZodDefault<z.ZodObject<{
         fixed_grace_period: z.ZodDefault<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>>;
+        deferred_grace_period: z.ZodDefault<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>>;
     }, "strip", z.ZodTypeAny, {
         fixed_grace_period: string;
+        deferred_grace_period: string;
     }, {
         fixed_grace_period?: string | undefined;
+        deferred_grace_period?: string | undefined;
     }>>;
     patterns: z.ZodDefault<z.ZodObject<{
         match: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
@@ -292,15 +472,22 @@ declare const configSchema: z.ZodObject<{
     logs: {
         sources: ({
             path: string;
-            name: string;
             type: "file";
-        } | {
             name: string;
+            ndjson?: {
+                messageField: string;
+                timestampField?: string | undefined;
+                levelField?: string | undefined;
+                levelFilter?: string[] | undefined;
+            } | undefined;
+            format?: "text" | "ndjson" | undefined;
+        } | {
             type: "docker";
+            name: string;
             container: string;
         } | {
-            name: string;
             type: "command";
+            name: string;
             run: string;
             interval: string;
         })[];
@@ -324,6 +511,7 @@ declare const configSchema: z.ZodObject<{
     };
     deduplication: {
         fixed_grace_period: string;
+        deferred_grace_period: string;
     };
     patterns: {
         ignore: string[];
@@ -345,15 +533,22 @@ declare const configSchema: z.ZodObject<{
     logs: {
         sources: ({
             path: string;
-            name: string;
             type: "file";
-        } | {
             name: string;
+            ndjson?: {
+                messageField: string;
+                timestampField?: string | undefined;
+                levelField?: string | undefined;
+                levelFilter?: string[] | undefined;
+            } | undefined;
+            format?: "text" | "ndjson" | undefined;
+        } | {
             type: "docker";
+            name: string;
             container: string;
         } | {
-            name: string;
             type: "command";
+            name: string;
             run: string;
             interval: string;
         })[];
@@ -377,6 +572,7 @@ declare const configSchema: z.ZodObject<{
     } | undefined;
     deduplication?: {
         fixed_grace_period?: string | undefined;
+        deferred_grace_period?: string | undefined;
     } | undefined;
     patterns?: {
         ignore?: string[] | undefined;
@@ -384,5 +580,5 @@ declare const configSchema: z.ZodObject<{
     } | undefined;
 }>;
 type Config = z.infer<typeof configSchema>;
-export { commandSourceSchema, configSchema, dockerSourceSchema, durationSchema, fileSourceSchema, logSourceSchema, patternSchema, };
+export { commandSourceSchema, configSchema, dockerSourceSchema, durationSchema, fileSourceSchema, logSourceSchema, ndjsonConfigSchema, patternSchema, };
 export type { Config };

package/dist/config/schema.js

@@ -17,10 +17,18 @@ const durationSchema = z
     };
     return amount * msByUnit[unit] <= MAX_DURATION_MS;
 }, 'Duration cannot exceed 24 hours');
+const ndjsonConfigSchema = z.object({
+    messageField: z.string().min(1),
+    timestampField: z.string().min(1).optional(),
+    levelField: z.string().min(1).optional(),
+    levelFilter: z.array(z.string().min(1)).optional(),
+});
 const fileSourceSchema = z.object({
     name: z.string().min(1),
     type: z.literal('file'),
     path: z.string().min(1),
+    format: z.enum(['text', 'ndjson']).optional(),
+    ndjson: ndjsonConfigSchema.optional(),
 });
 const dockerSourceSchema = z.object({
     name: z.string().min(1),
@@ -59,7 +67,15 @@ const configSchema = z.object({
             .refine((sources) => {
             const names = sources.map((source) => source.name);
             return names.length === new Set(names).size;
-        }, { message: 'Log source names must be unique' }),
+        }, { message: 'Log source names must be unique' })
+            .refine((sources) => {
+            return sources.every((source) => {
+                if (source.type === 'file' && source.format === 'ndjson') {
+                    return source.ndjson !== undefined;
+                }
+                return true;
+            });
+        }, { message: 'ndjson config is required when format is "ndjson"' }),
         context_lines_before: z.number().int().min(0).default(10),
         context_lines_after: z.number().int().min(0).default(5),
         max_line_buffer: z.number().int().min(100).default(10000),
@@ -92,6 +108,7 @@ const configSchema = z.object({
     deduplication: z
         .object({
         fixed_grace_period: durationSchema.default('10m'),
+        deferred_grace_period: durationSchema.default('1h'),
     })
         .default({}),
     patterns: z
@@ -101,4 +118,4 @@ const configSchema = z.object({
     })
         .default({}),
 });
-export { commandSourceSchema, configSchema, dockerSourceSchema, durationSchema, fileSourceSchema, logSourceSchema, patternSchema, };
+export { commandSourceSchema, configSchema, dockerSourceSchema, durationSchema, fileSourceSchema, logSourceSchema, ndjsonConfigSchema, patternSchema, };

package/dist/db/queries.d.ts

@@ -35,7 +35,7 @@ export type ErrorInsert = {
     createdAt?: string;
     updatedAt?: string;
 };
-export type ActivityAction = 'watcher_start' | 'watcher_stop' | 'error_detected' | 'error_deduplicated' | 'analysis_start' | 'analysis_complete' | 'analysis_failed' | 'analysis_timeout' | 'already_fixed_detected' | 'fix_start' | 'fix_complete' | 'fix_failed' | 'fix_timeout' | 'verification_start' | 'verification_pass' | 'verification_fail' | 'error_ignored' | 'lock_acquired' | 'lock_released' | 'lock_expired' | 'stale_recovery';
+export type ActivityAction = 'watcher_start' | 'watcher_stop' | 'error_detected' | 'error_deduplicated' | 'analysis_start' | 'analysis_complete' | 'analysis_failed' | 'analysis_timeout' | 'already_fixed_detected' | 'error_deferred' | 'deferred_reanalyzed' | 'fix_start' | 'fix_complete' | 'fix_failed' | 'fix_timeout' | 'verification_start' | 'verification_pass' | 'verification_fail' | 'error_ignored' | 'lock_acquired' | 'lock_released' | 'lock_expired' | 'stale_recovery';
 export declare function insertError(db: Database, error: ErrorInsert): number;
 export declare function getError(db: Database, id: number): ErrorRecord | null;
 export declare function getErrorByHash(db: Database, hash: string): ErrorRecord | null;