devchain-cli 0.24.0 → 0.24.2

package/dist/server/modules/file-sync/file-sync.dto.d.ts

@@ -6,6 +6,7 @@ export type FolderType = z.infer<typeof FolderTypeSchema>;
 export declare const FolderIdSchema: z.ZodString;
 export declare const IGNORE_PATTERNS_MAX = 200;
 export declare const IGNORE_PATTERN_MAX_LENGTH = 256;
+export declare const FILE_SYNC_IGNORES_CHANGED = "FILE_SYNC_IGNORES_CHANGED";
 export declare const IgnorePatternsSchema: z.ZodArray<z.ZodString, "many">;
 export declare const DEFAULT_FILE_SYNC_IGNORES: readonly string[];
 export declare const CODE_SYSTEM_IGNORE = "/.git";
@@ -23,19 +24,82 @@ export declare const SyncDeviceSchema: z.ZodObject<{
     deviceId: string;
 }>;
 export type SyncDevice = z.infer<typeof SyncDeviceSchema>;
-export declare const SyncFolderRequestSchema: z.ZodObject<{
+export declare const ForceCopySchema: z.ZodObject<{
+    operationId: z.ZodEffects<z.ZodString, string, string>;
+}, "strict", z.ZodTypeAny, {
+    operationId: string;
+}, {
+    operationId: string;
+}>;
+export declare const ForceCopyBackupRequestSchema: z.ZodObject<{
+    projectId: z.ZodEffects<z.ZodString, string, string>;
+    kind: z.ZodEnum<["code", "git"]>;
+    forceCopy: z.ZodObject<{
+        operationId: z.ZodEffects<z.ZodString, string, string>;
+    }, "strict", z.ZodTypeAny, {
+        operationId: string;
+    }, {
+        operationId: string;
+    }>;
+}, "strict", z.ZodTypeAny, {
+    projectId: string;
+    kind: "code" | "git";
+    forceCopy: {
+        operationId: string;
+    };
+}, {
+    projectId: string;
+    kind: "code" | "git";
+    forceCopy: {
+        operationId: string;
+    };
+}>;
+export type ForceCopyBackupRequest = z.infer<typeof ForceCopyBackupRequestSchema>;
+export declare const ForceCopyBackupSchema: z.ZodObject<{
+    path: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    path: string;
+}, {
+    path: string;
+}>;
+export type ForceCopyBackup = z.infer<typeof ForceCopyBackupSchema>;
+export declare const RECEIVE_ONLY_SAMPLE_MAX = 200;
+export declare const TRANSIENT_SYNC_ERROR = "file modified but not rescanned; will try again later";
+export declare const isTransientSyncError: (error: string) => boolean;
+export declare const ReceiveOnlyChangesSchema: z.ZodObject<{
+    count: z.ZodNumber;
+    sample: z.ZodArray<z.ZodString, "many">;
+}, "strip", z.ZodTypeAny, {
+    count: number;
+    sample: string[];
+}, {
+    count: number;
+    sample: string[];
+}>;
+export type ReceiveOnlyChanges = z.infer<typeof ReceiveOnlyChangesSchema>;
+export declare const SyncFolderRequestSchema: z.ZodEffects<z.ZodObject<{
     projectId: z.ZodString;
     kind: z.ZodEnum<["code", "git"]>;
     type: z.ZodEnum<["sendonly", "receiveonly", "sendreceive"]>;
     peerDeviceId: z.ZodString;
     ignores: z.ZodEffects<z.ZodArray<z.ZodString, "many">, string[], string[]>;
     paused: z.ZodOptional<z.ZodBoolean>;
+    forceCopy: z.ZodOptional<z.ZodObject<{
+        operationId: z.ZodEffects<z.ZodString, string, string>;
+    }, "strict", z.ZodTypeAny, {
+        operationId: string;
+    }, {
+        operationId: string;
+    }>>;
 }, "strict", z.ZodTypeAny, {
     type: "sendonly" | "receiveonly" | "sendreceive";
     projectId: string;
     kind: "code" | "git";
     peerDeviceId: string;
     ignores: string[];
+    forceCopy?: {
+        operationId: string;
+    } | undefined;
     paused?: boolean | undefined;
 }, {
     type: "sendonly" | "receiveonly" | "sendreceive";
@@ -43,6 +107,29 @@ export declare const SyncFolderRequestSchema: z.ZodObject<{
     kind: "code" | "git";
     peerDeviceId: string;
     ignores: string[];
+    forceCopy?: {
+        operationId: string;
+    } | undefined;
+    paused?: boolean | undefined;
+}>, {
+    type: "sendonly" | "receiveonly" | "sendreceive";
+    projectId: string;
+    kind: "code" | "git";
+    peerDeviceId: string;
+    ignores: string[];
+    forceCopy?: {
+        operationId: string;
+    } | undefined;
+    paused?: boolean | undefined;
+}, {
+    type: "sendonly" | "receiveonly" | "sendreceive";
+    projectId: string;
+    kind: "code" | "git";
+    peerDeviceId: string;
+    ignores: string[];
+    forceCopy?: {
+        operationId: string;
+    } | undefined;
     paused?: boolean | undefined;
 }>;
 export type SyncFolderRequest = z.infer<typeof SyncFolderRequestSchema>;
@@ -51,18 +138,45 @@ export declare const SyncFolderSchema: z.ZodObject<{
     path: z.ZodString;
     type: z.ZodEnum<["sendonly", "receiveonly", "sendreceive"]>;
     paused: z.ZodBoolean;
+    backupPath: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     path: string;
     type: "sendonly" | "receiveonly" | "sendreceive";
     id: string;
     paused: boolean;
+    backupPath?: string | undefined;
 }, {
     path: string;
     type: "sendonly" | "receiveonly" | "sendreceive";
     id: string;
     paused: boolean;
+    backupPath?: string | undefined;
 }>;
 export type SyncFolder = z.infer<typeof SyncFolderSchema>;
+export declare const SyncFolderConfigurationSchema: z.ZodObject<{
+    type: z.ZodEnum<["sendonly", "receiveonly", "sendreceive"]>;
+    paused: z.ZodBoolean;
+    devices: z.ZodArray<z.ZodObject<{
+        deviceID: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        deviceID: string;
+    }, {
+        deviceID: string;
+    }>, "many">;
+}, "strip", z.ZodTypeAny, {
+    type: "sendonly" | "receiveonly" | "sendreceive";
+    paused: boolean;
+    devices: {
+        deviceID: string;
+    }[];
+}, {
+    type: "sendonly" | "receiveonly" | "sendreceive";
+    paused: boolean;
+    devices: {
+        deviceID: string;
+    }[];
+}>;
+export type SyncFolderConfiguration = z.infer<typeof SyncFolderConfigurationSchema>;
 export declare const SyncFolderPatchSchema: z.ZodEffects<z.ZodObject<{
     type: z.ZodOptional<z.ZodEnum<["sendonly", "receiveonly", "sendreceive"]>>;
     paused: z.ZodOptional<z.ZodBoolean>;
@@ -88,18 +202,35 @@ export type SyncFolderPatch = z.infer<typeof SyncFolderPatchSchema>;
 export declare const SyncStatusQuerySchema: z.ZodObject<{
     folder: z.ZodString;
     device: z.ZodOptional<z.ZodString>;
+    errors: z.ZodOptional<z.ZodLiteral<"all">>;
 }, "strict", z.ZodTypeAny, {
     folder: string;
+    errors?: "all" | undefined;
     device?: string | undefined;
 }, {
     folder: string;
+    errors?: "all" | undefined;
     device?: string | undefined;
 }>;
+export interface SyncStatusOptions {
+    allErrors?: boolean;
+}
 export declare const FolderSyncStatusSchema: z.ZodObject<{
     folderId: z.ZodString;
     state: z.ZodString;
     error: z.ZodOptional<z.ZodString>;
     errors: z.ZodOptional<z.ZodNumber>;
+    pullErrors: z.ZodOptional<z.ZodNumber>;
+    fileErrors: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        path: z.ZodString;
+        error: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        error: string;
+        path: string;
+    }, {
+        error: string;
+        path: string;
+    }>, "many">>;
     localFiles: z.ZodNumber;
     localDirectories: z.ZodNumber;
     globalFiles: z.ZodNumber;
@@ -145,6 +276,11 @@ export declare const FolderSyncStatusSchema: z.ZodObject<{
     } | null;
     error?: string | undefined;
     errors?: number | undefined;
+    pullErrors?: number | undefined;
+    fileErrors?: {
+        error: string;
+        path: string;
+    }[] | undefined;
 }, {
     state: string;
     folderId: string;
@@ -164,12 +300,95 @@ export declare const FolderSyncStatusSchema: z.ZodObject<{
     } | null;
     error?: string | undefined;
     errors?: number | undefined;
+    pullErrors?: number | undefined;
+    fileErrors?: {
+        error: string;
+        path: string;
+    }[] | undefined;
 }>;
 export type FolderSyncStatus = z.infer<typeof FolderSyncStatusSchema>;
+export declare const FILE_SYNC_REPORT_SAMPLE = 20;
+export declare const CONFLICT_BASELINE_MAX = 1000;
+export declare const ConflictBaselineSchema: z.ZodUnion<[z.ZodObject<{
+    baselineOverCap: z.ZodLiteral<false>;
+    paths: z.ZodArray<z.ZodString, "many">;
+}, "strip", z.ZodTypeAny, {
+    baselineOverCap: false;
+    paths: string[];
+}, {
+    baselineOverCap: false;
+    paths: string[];
+}>, z.ZodObject<{
+    baselineOverCap: z.ZodLiteral<true>;
+}, "strict", z.ZodTypeAny, {
+    baselineOverCap: true;
+}, {
+    baselineOverCap: true;
+}>]>;
+export type ConflictBaseline = z.infer<typeof ConflictBaselineSchema>;
+export declare const RemoteNeedQuerySchema: z.ZodObject<{
+    device: z.ZodString;
+}, "strict", z.ZodTypeAny, {
+    device: string;
+}, {
+    device: string;
+}>;
+export declare const RemoteNeedSchema: z.ZodObject<{
+    total: z.ZodNumber;
+    deleted: z.ZodNumber;
+    sample: z.ZodArray<z.ZodObject<{
+        path: z.ZodString;
+        deleted: z.ZodBoolean;
+    }, "strip", z.ZodTypeAny, {
+        path: string;
+        deleted: boolean;
+    }, {
+        path: string;
+        deleted: boolean;
+    }>, "many">;
+    conflictPaths: z.ZodArray<z.ZodString, "many">;
+    conflictsOverCap: z.ZodBoolean;
+}, "strip", z.ZodTypeAny, {
+    deleted: number;
+    total: number;
+    sample: {
+        path: string;
+        deleted: boolean;
+    }[];
+    conflictPaths: string[];
+    conflictsOverCap: boolean;
+}, {
+    deleted: number;
+    total: number;
+    sample: {
+        path: string;
+        deleted: boolean;
+    }[];
+    conflictPaths: string[];
+    conflictsOverCap: boolean;
+}>;
+export type RemoteNeed = z.infer<typeof RemoteNeedSchema>;
+export declare const ConflictReportSchema: z.ZodObject<{
+    total: z.ZodNumber;
+    sample: z.ZodArray<z.ZodString, "many">;
+    baselineOverCap: z.ZodOptional<z.ZodBoolean>;
+}, "strip", z.ZodTypeAny, {
+    total: number;
+    sample: string[];
+    baselineOverCap?: boolean | undefined;
+}, {
+    total: number;
+    sample: string[];
+    baselineOverCap?: boolean | undefined;
+}>;
+export type ConflictReport = z.infer<typeof ConflictReportSchema>;
 export declare const IgnoresBodySchema: z.ZodObject<{
     ignores: z.ZodNullable<z.ZodArray<z.ZodString, "many">>;
+    revision: z.ZodNumber;
 }, "strict", z.ZodTypeAny, {
+    revision: number;
     ignores: string[] | null;
 }, {
+    revision: number;
     ignores: string[] | null;
 }>;

package/dist/server/modules/file-sync/file-sync.dto.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IgnoresBodySchema = exports.FolderSyncStatusSchema = exports.SyncStatusQuerySchema = exports.SyncFolderPatchSchema = exports.SyncFolderSchema = exports.SyncFolderRequestSchema = exports.SyncDeviceSchema = exports.FolderIgnoresSchema = exports.CODE_SYSTEM_IGNORE = exports.DEFAULT_FILE_SYNC_IGNORES = exports.IgnorePatternsSchema = exports.IGNORE_PATTERN_MAX_LENGTH = exports.IGNORE_PATTERNS_MAX = exports.FolderIdSchema = exports.FolderTypeSchema = exports.PeerAddressSchema = exports.DeviceIdSchema = void 0;
+exports.IgnoresBodySchema = exports.ConflictReportSchema = exports.RemoteNeedSchema = exports.RemoteNeedQuerySchema = exports.ConflictBaselineSchema = exports.CONFLICT_BASELINE_MAX = exports.FILE_SYNC_REPORT_SAMPLE = exports.FolderSyncStatusSchema = exports.SyncStatusQuerySchema = exports.SyncFolderPatchSchema = exports.SyncFolderConfigurationSchema = exports.SyncFolderSchema = exports.SyncFolderRequestSchema = exports.ReceiveOnlyChangesSchema = exports.isTransientSyncError = exports.TRANSIENT_SYNC_ERROR = exports.RECEIVE_ONLY_SAMPLE_MAX = exports.ForceCopyBackupSchema = exports.ForceCopyBackupRequestSchema = exports.ForceCopySchema = exports.SyncDeviceSchema = exports.FolderIgnoresSchema = exports.CODE_SYSTEM_IGNORE = exports.DEFAULT_FILE_SYNC_IGNORES = exports.IgnorePatternsSchema = exports.FILE_SYNC_IGNORES_CHANGED = exports.IGNORE_PATTERN_MAX_LENGTH = exports.IGNORE_PATTERNS_MAX = exports.FolderIdSchema = exports.FolderTypeSchema = exports.PeerAddressSchema = exports.DeviceIdSchema = void 0;
 exports.codeIgnores = codeIgnores;
 exports.gitIgnores = gitIgnores;
 const zod_1 = require("zod");
@@ -16,6 +16,7 @@ exports.FolderIdSchema = zod_1.z
     .regex(/^((?:code|git):[^:\s]+|tx:[a-z0-9-]+:[^:\s]+)$/);
 exports.IGNORE_PATTERNS_MAX = 200;
 exports.IGNORE_PATTERN_MAX_LENGTH = 256;
+exports.FILE_SYNC_IGNORES_CHANGED = 'FILE_SYNC_IGNORES_CHANGED';
 const IgnorePatternSchema = zod_1.z.string().min(1).max(exports.IGNORE_PATTERN_MAX_LENGTH);
 exports.IgnorePatternsSchema = zod_1.z.array(IgnorePatternSchema).max(exports.IGNORE_PATTERNS_MAX);
 exports.DEFAULT_FILE_SYNC_IGNORES = [
@@ -41,6 +42,29 @@ exports.FolderIgnoresSchema = zod_1.z
     .max(2 * exports.IGNORE_PATTERNS_MAX + 1)
     .refine((patterns) => patterns.length <= 2 * exports.IGNORE_PATTERNS_MAX || patterns[0] === exports.CODE_SYSTEM_IGNORE, 'Only the leading system pattern is outside the installed ignore cap');
 exports.SyncDeviceSchema = zod_1.z.object({ deviceId: exports.DeviceIdSchema, address: exports.PeerAddressSchema });
+const BackupSegmentSchema = zod_1.z
+    .string()
+    .min(1)
+    .max(128)
+    .regex(/^[^/\\\0]+$/)
+    .refine((value) => value !== '.' && value !== '..');
+exports.ForceCopySchema = zod_1.z.object({ operationId: BackupSegmentSchema }).strict();
+exports.ForceCopyBackupRequestSchema = zod_1.z
+    .object({
+    projectId: BackupSegmentSchema,
+    kind: zod_1.z.enum(['code', 'git']),
+    forceCopy: exports.ForceCopySchema,
+})
+    .strict();
+exports.ForceCopyBackupSchema = zod_1.z.object({ path: zod_1.z.string() });
+exports.RECEIVE_ONLY_SAMPLE_MAX = 200;
+exports.TRANSIENT_SYNC_ERROR = 'file modified but not rescanned; will try again later';
+const isTransientSyncError = (error) => error.toLowerCase().includes(exports.TRANSIENT_SYNC_ERROR);
+exports.isTransientSyncError = isTransientSyncError;
+exports.ReceiveOnlyChangesSchema = zod_1.z.object({
+    count: zod_1.z.number().int().nonnegative(),
+    sample: zod_1.z.array(zod_1.z.string()).max(exports.RECEIVE_ONLY_SAMPLE_MAX),
+});
 exports.SyncFolderRequestSchema = zod_1.z
     .object({
     projectId: zod_1.z.string().trim().min(1).max(128),
@@ -49,13 +73,23 @@ exports.SyncFolderRequestSchema = zod_1.z
     peerDeviceId: exports.DeviceIdSchema,
     ignores: exports.FolderIgnoresSchema,
     paused: zod_1.z.boolean().optional(),
+    forceCopy: exports.ForceCopySchema.optional(),
 })
-    .strict();
+    .strict()
+    .refine((request) => !request.forceCopy || request.type === 'receiveonly', {
+    message: 'Force copy backups require a receive-only folder',
+});
 exports.SyncFolderSchema = zod_1.z.object({
     id: exports.FolderIdSchema,
     path: zod_1.z.string(),
     type: exports.FolderTypeSchema,
     paused: zod_1.z.boolean(),
+    backupPath: zod_1.z.string().optional(),
+});
+exports.SyncFolderConfigurationSchema = zod_1.z.object({
+    type: exports.FolderTypeSchema,
+    paused: zod_1.z.boolean(),
+    devices: zod_1.z.array(zod_1.z.object({ deviceID: zod_1.z.string() })),
 });
 exports.SyncFolderPatchSchema = zod_1.z
     .object({
@@ -68,13 +102,19 @@ exports.SyncFolderPatchSchema = zod_1.z
     message: 'type, paused or ignores is required',
 });
 exports.SyncStatusQuerySchema = zod_1.z
-    .object({ folder: exports.FolderIdSchema, device: exports.DeviceIdSchema.optional() })
+    .object({
+    folder: exports.FolderIdSchema,
+    device: exports.DeviceIdSchema.optional(),
+    errors: zod_1.z.literal('all').optional(),
+})
     .strict();
 exports.FolderSyncStatusSchema = zod_1.z.object({
     folderId: zod_1.z.string(),
     state: zod_1.z.string(),
     error: zod_1.z.string().optional(),
     errors: zod_1.z.number().optional(),
+    pullErrors: zod_1.z.number().optional(),
+    fileErrors: zod_1.z.array(zod_1.z.object({ path: zod_1.z.string(), error: zod_1.z.string() })).optional(),
     localFiles: zod_1.z.number(),
     localDirectories: zod_1.z.number(),
     globalFiles: zod_1.z.number(),
@@ -92,5 +132,31 @@ exports.FolderSyncStatusSchema = zod_1.z.object({
     })
         .nullable(),
 });
-exports.IgnoresBodySchema = zod_1.z.object({ ignores: exports.IgnorePatternsSchema.nullable() }).strict();
+exports.FILE_SYNC_REPORT_SAMPLE = 20;
+exports.CONFLICT_BASELINE_MAX = 1000;
+exports.ConflictBaselineSchema = zod_1.z.union([
+    zod_1.z.object({
+        baselineOverCap: zod_1.z.literal(false),
+        paths: zod_1.z.array(zod_1.z.string()).max(exports.CONFLICT_BASELINE_MAX),
+    }),
+    zod_1.z.object({ baselineOverCap: zod_1.z.literal(true) }).strict(),
+]);
+exports.RemoteNeedQuerySchema = zod_1.z.object({ device: exports.DeviceIdSchema }).strict();
+exports.RemoteNeedSchema = zod_1.z.object({
+    total: zod_1.z.number().int().nonnegative(),
+    deleted: zod_1.z.number().int().nonnegative(),
+    sample: zod_1.z
+        .array(zod_1.z.object({ path: zod_1.z.string(), deleted: zod_1.z.boolean() }))
+        .max(exports.FILE_SYNC_REPORT_SAMPLE),
+    conflictPaths: zod_1.z.array(zod_1.z.string()).max(exports.CONFLICT_BASELINE_MAX),
+    conflictsOverCap: zod_1.z.boolean(),
+});
+exports.ConflictReportSchema = zod_1.z.object({
+    total: zod_1.z.number().int().nonnegative(),
+    sample: zod_1.z.array(zod_1.z.string()).max(exports.FILE_SYNC_REPORT_SAMPLE),
+    baselineOverCap: zod_1.z.boolean().optional(),
+});
+exports.IgnoresBodySchema = zod_1.z
+    .object({ ignores: exports.IgnorePatternsSchema.nullable(), revision: zod_1.z.number().int().nonnegative() })
+    .strict();
 //# sourceMappingURL=file-sync.dto.js.map

package/dist/server/modules/file-sync/file-sync.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-sync.dto.js","sourceRoot":"","sources":["../../../src/modules/file-sync/file-sync.dto.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"file-sync.dto.js","sourceRoot":"","sources":["../../../src/modules/file-sync/file-sync.dto.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/file-sync/file-sync.module.js

@@ -15,20 +15,30 @@ const process_executor_module_1 = require("../terminal/services/process-executor
 const file_sync_paths_1 = require("./file-sync-paths");
 const file_sync_controller_1 = require("./file-sync.controller");
 const file_sync_ignores_store_1 = require("./file-sync-ignores.store");
+const file_sync_auto_fix_store_1 = require("./file-sync-auto-fix.store");
 const file_sync_managed_exclusions_store_1 = require("./file-sync-managed-exclusions.store");
 const file_sync_service_1 = require("./file-sync.service");
+const sync_path_inspector_1 = require("./sync-path-inspector");
 const home_git_guard_service_1 = require("./home-git-guard.service");
 const host_sync_controller_1 = require("./host-sync.controller");
+const host_git_guard_controller_1 = require("./host-git-guard.controller");
+const host_git_index_controller_1 = require("./host-git-index.controller");
 const syncthing_launcher_1 = require("./syncthing-launcher");
 const syncthing_manager_service_1 = require("./syncthing-manager.service");
 const syncthing_settings_store_1 = require("./syncthing-settings.store");
+const sync_chown_service_1 = require("./sync-chown.service");
 let FileSyncModule = class FileSyncModule {
 };
 exports.FileSyncModule = FileSyncModule;
 exports.FileSyncModule = FileSyncModule = __decorate([
     (0, common_1.Module)({
         imports: [db_module_1.DbModule, storage_module_1.StorageModule, git_module_1.GitModule, process_executor_module_1.ProcessExecutorModule],
-        controllers: [host_sync_controller_1.HostSyncController, file_sync_controller_1.FileSyncController],
+        controllers: [
+            host_sync_controller_1.HostSyncController,
+            host_git_guard_controller_1.HostGitGuardController,
+            host_git_index_controller_1.HostGitIndexController,
+            file_sync_controller_1.FileSyncController,
+        ],
         providers: [
             { provide: file_sync_paths_1.FILE_SYNC_PATHS, useFactory: () => (0, file_sync_paths_1.createProductionFileSyncPaths)() },
             { provide: syncthing_launcher_1.SyncthingLauncher, useClass: syncthing_launcher_1.NodeSyncthingLauncher },
@@ -36,15 +46,20 @@ exports.FileSyncModule = FileSyncModule = __decorate([
             syncthing_settings_store_1.SyncthingSettingsStore,
             syncthing_manager_service_1.SyncthingManager,
             file_sync_ignores_store_1.FileSyncIgnoresStore,
+            file_sync_auto_fix_store_1.FileSyncAutoFixStore,
             file_sync_managed_exclusions_store_1.FileSyncManagedExclusionsStore,
             file_sync_service_1.FileSyncService,
+            sync_path_inspector_1.SyncPathInspector,
+            sync_chown_service_1.SyncChownService,
             home_git_guard_service_1.HomeGitGuardService,
         ],
         exports: [
             file_sync_paths_1.FILE_SYNC_PATHS,
             syncthing_manager_service_1.SyncthingManager,
             file_sync_service_1.FileSyncService,
+            sync_path_inspector_1.SyncPathInspector,
             file_sync_managed_exclusions_store_1.FileSyncManagedExclusionsStore,
+            file_sync_auto_fix_store_1.FileSyncAutoFixStore,
             home_git_guard_service_1.HomeGitGuardService,
         ],
     })

package/dist/server/modules/file-sync/file-sync.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-sync.module.js","sourceRoot":"","sources":["../../../src/modules/file-sync/file-sync.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,uDAAmD;AACnD,8DAA0D;AAC1D,kDAA8C;AAC9C,2GAAsG;AACtG,uDAAmF;AACnF,iEAA4D;AAC5D,uEAAiE;AACjE,6FAAsF;AACtF,2DAAsD;AACtD,qEAA+D;AAC/D,iEAA4D;AAC5D,6DAAgF;AAChF,2EAIqC;AACrC,yEAAoE;AAwB7D,IAAM,cAAc,GAApB,MAAM,cAAc;CAAG,CAAA;AAAjB,wCAAc;yBAAd,cAAc;IAtB1B,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,oBAAQ,EAAE,8BAAa,EAAE,sBAAS,EAAE,+CAAqB,CAAC;QACpE,WAAW,EAAE,CAAC,yCAAkB,EAAE,yCAAkB,CAAC;QACrD,SAAS,EAAE;YACT,EAAE,OAAO,EAAE,iCAAe,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,IAAA,+CAA6B,GAAE,EAAE;YAC/E,EAAE,OAAO,EAAE,sCAAiB,EAAE,QAAQ,EAAE,0CAAqB,EAAE;YAC/D,EAAE,OAAO,EAAE,qDAAyB,EAAE,QAAQ,EAAE,6DAAiC,EAAE;YACnF,iDAAsB;YACtB,4CAAgB;YAChB,8CAAoB;YACpB,mEAA8B;YAC9B,mCAAe;YACf,4CAAmB;SACpB;QACD,OAAO,EAAE;YACP,iCAAe;YACf,4CAAgB;YAChB,mCAAe;YACf,mEAA8B;YAC9B,4CAAmB;SACpB;KACF,CAAC;GACW,cAAc,CAAG"}
+{"version":3,"file":"file-sync.module.js","sourceRoot":"","sources":["../../../src/modules/file-sync/file-sync.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,uDAAmD;AACnD,8DAA0D;AAC1D,kDAA8C;AAC9C,2GAAsG;AACtG,uDAAmF;AACnF,iEAA4D;AAC5D,uEAAiE;AACjE,yEAAkE;AAClE,6FAAsF;AACtF,2DAAsD;AACtD,+DAA0D;AAC1D,qEAA+D;AAC/D,iEAA4D;AAC5D,2EAAqE;AACrE,2EAAqE;AACrE,6DAAgF;AAChF,2EAIqC;AACrC,yEAAoE;AACpE,6DAAwD;AAkCjD,IAAM,cAAc,GAApB,MAAM,cAAc;CAAG,CAAA;AAAjB,wCAAc;yBAAd,cAAc;IAhC1B,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,oBAAQ,EAAE,8BAAa,EAAE,sBAAS,EAAE,+CAAqB,CAAC;QACpE,WAAW,EAAE;YACX,yCAAkB;YAClB,kDAAsB;YACtB,kDAAsB;YACtB,yCAAkB;SACnB;QACD,SAAS,EAAE;YACT,EAAE,OAAO,EAAE,iCAAe,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,IAAA,+CAA6B,GAAE,EAAE;YAC/E,EAAE,OAAO,EAAE,sCAAiB,EAAE,QAAQ,EAAE,0CAAqB,EAAE;YAC/D,EAAE,OAAO,EAAE,qDAAyB,EAAE,QAAQ,EAAE,6DAAiC,EAAE;YACnF,iDAAsB;YACtB,4CAAgB;YAChB,8CAAoB;YACpB,+CAAoB;YACpB,mEAA8B;YAC9B,mCAAe;YACf,uCAAiB;YACjB,qCAAgB;YAChB,4CAAmB;SACpB;QACD,OAAO,EAAE;YACP,iCAAe;YACf,4CAAgB;YAChB,mCAAe;YACf,uCAAiB;YACjB,mEAA8B;YAC9B,+CAAoB;YACpB,4CAAmB;SACpB;KACF,CAAC;GACW,cAAc,CAAG"}

package/dist/server/modules/file-sync/file-sync.service.d.ts

@@ -1,7 +1,7 @@
 import { AppError } from '../../common/errors/error-types';
 import { type ProjectStorage } from '../storage/interfaces/storage.interface';
 import { type FileSyncPaths } from './file-sync-paths';
-import { type FolderSyncStatus, type FolderType, type SyncDevice, type SyncFolder, type SyncFolderPatch, type SyncFolderRequest } from './file-sync.dto';
+import { type FolderSyncStatus, type FolderType, type RemoteNeed, type ConflictReport, type ConflictBaseline, type SyncDevice, type SyncFolder, type SyncFolderPatch, type SyncFolderRequest, type SyncStatusOptions, type ForceCopyBackupRequest, type ForceCopyBackup, type ReceiveOnlyChanges } from './file-sync.dto';
 import { FileSyncIgnoresStore } from './file-sync-ignores.store';
 import { SyncthingManager } from './syncthing-manager.service';
 export declare const FOLDER_WATCHER_DELAY_S = 1;
@@ -24,11 +24,12 @@ export declare class FileSyncUnavailableError extends AppError {
     constructor(reason: string);
 }
 export declare class FileSyncTimeoutError extends AppError {
-    constructor(folderId: string, progress: SyncProgress | null, lastError: string | null);
+    constructor(folderId: string, progress: SyncProgress | null, lastError: string | null, syncErrors?: string[]);
 }
 export declare function codeFolderId(projectId: string): string;
 export declare function projectFolderId(projectId: string, kind: ProjectFolder['kind']): string;
 export declare function projectFolderList(projectId: string, kinds?: readonly ProjectFolder['kind'][]): ProjectFolder[];
+export declare function senderIndexReached(sender: FolderSyncStatus, receiver: FolderSyncStatus): boolean;
 export declare function evaluateCompletion(sender: FolderSyncStatus, receiver: FolderSyncStatus): {
     done: boolean;
     progress: SyncProgress;
@@ -48,6 +49,12 @@ export interface WaitForCompleteOptions {
     onProgress?: (progress: SyncProgress) => void;
     pollIntervalMs?: number;
     symmetric?: boolean;
+    requireNoReceiveOnlyChanges?: boolean;
+    signal?: AbortSignal;
+    sides?: {
+        sender: string;
+        receiver: string;
+    };
 }
 export declare class FileSyncService {
     private readonly syncthing;
@@ -60,12 +67,14 @@ export declare class FileSyncService {
     addPeer(peer: SyncDevice): Promise<void>;
     isConnected(deviceId: string): Promise<boolean>;
     getIgnores(projectId: string): string[];
-    setIgnores(projectId: string, ignores: string[] | null): string[];
+    getIgnoresRevision(projectId: string): number;
+    setIgnores(projectId: string, ignores: string[] | null, revision?: number): string[];
     projectFolders(projectId: string): Promise<ProjectFolder[]>;
     initialFolders(projectId: string): Promise<ProjectFolder[]>;
     projectNeed(projectId: string): Promise<FolderNeed[] | null>;
     folderPath(projectId: string, kind?: ProjectFolder['kind']): Promise<string>;
     ensureFolder(request: SyncFolderRequest): Promise<SyncFolder>;
+    forceCopyBackup(request: ForceCopyBackupRequest): Promise<ForceCopyBackup>;
     updateFolder(folderId: string, patch: SyncFolderPatch): Promise<void>;
     folderConfiguration(folderId: string): Promise<{
         type: "sendonly" | "receiveonly" | "sendreceive";
@@ -75,10 +84,16 @@ export declare class FileSyncService {
         }[];
     }>;
     setFolderType(folderId: string, type: FolderType): Promise<void>;
-    status(folderId: string, peerDeviceId?: string): Promise<FolderSyncStatus>;
+    status(folderId: string, peerDeviceId?: string, options?: SyncStatusOptions): Promise<FolderSyncStatus>;
+    remoteNeed(folderId: string, peerDeviceId: string): Promise<RemoteNeed>;
+    conflicts(projectId: string, baseline: ConflictBaseline, ignores: readonly string[], signal?: AbortSignal): Promise<ConflictReport>;
+    conflictBaseline(projectId: string, ignores: readonly string[], signal?: AbortSignal): Promise<ConflictBaseline>;
+    private fileErrors;
     removeFolder(folderId: string): Promise<void>;
-    rescan(folderId: string): Promise<void>;
+    rescan(folderId: string, signal?: AbortSignal): Promise<void>;
     revertLocalChanges(folderId: string): Promise<void>;
+    override(folderId: string): Promise<void>;
+    localChanges(folderId: string): Promise<ReceiveOnlyChanges>;
     waitForComplete(folderId: string, options: WaitForCompleteOptions): Promise<SyncProgress>;
     private connection;
     private client;