devchain-cli 0.24.1 → 0.25.0

package/dist/server/modules/file-sync/syncthing-manager.service.js

@@ -16,11 +16,13 @@ exports.SyncthingManager = exports.DEFAULT_SYNCTHING_MANAGER_TIMINGS = exports.S
 const common_1 = require("@nestjs/common");
 const zod_1 = require("zod");
 const crypto_1 = require("crypto");
+const fs_1 = require("fs");
 const promises_1 = require("fs/promises");
 const net_1 = require("net");
 const path_1 = require("path");
 const env_config_1 = require("../../common/config/env.config");
 const logger_1 = require("../../common/logging/logger");
+const file_sync_dto_1 = require("./file-sync.dto");
 const file_sync_paths_1 = require("./file-sync-paths");
 const syncthing_launcher_1 = require("./syncthing-launcher");
 const syncthing_rest_client_1 = require("./syncthing-rest.client");
@@ -50,6 +52,7 @@ let SyncthingManager = class SyncthingManager {
         available: false,
         version: null,
         running: false,
+        privileged: false,
         deviceId: null,
         apiPort: null,
         error: null,
@@ -59,6 +62,7 @@ let SyncthingManager = class SyncthingManager {
     stopping = false;
     failures = 0;
     transcriptFoldersRemoved = false;
+    warnedUnprivilegedHost = false;
     restartTimer = null;
     monitorTimer = null;
     constructor(paths, launcher, settings, timings) {
@@ -101,7 +105,7 @@ let SyncthingManager = class SyncthingManager {
         this.stopMonitor();
         const instance = this.instance;
         this.instance = null;
-        this.state = { ...this.state, running: false };
+        this.state = { ...this.state, running: false, privileged: false };
         if (!instance)
             return;
         instance.childPid ??= await this.launcher.findChildPid(instance.proc.pid);
@@ -127,6 +131,7 @@ let SyncthingManager = class SyncthingManager {
                 available: false,
                 version: binary.version,
                 running: false,
+                privileged: false,
                 deviceId: null,
                 apiPort: null,
                 error: binary.error,
@@ -148,7 +153,7 @@ let SyncthingManager = class SyncthingManager {
             this.instance = null;
             if (instance)
                 await this.kill(instance);
-            this.state = { ...this.state, running: false, error: reason };
+            this.state = { ...this.state, running: false, privileged: false, error: reason };
             logger.warn({ reason }, 'Syncthing did not start');
             this.scheduleRestart();
         }
@@ -190,6 +195,14 @@ let SyncthingManager = class SyncthingManager {
         });
         await this.waitForApi(instance, home);
         instance.childPid = (await this.launcher.findChildPid(proc.pid)) ?? proc.pid;
+        const privileged = await this.launcher.hasOwnershipCapabilities(instance.childPid);
+        this.state = { ...this.state, privileged };
+        if (!privileged &&
+            !this.warnedUnprivilegedHost &&
+            (0, fs_1.existsSync)((0, path_1.join)((0, env_config_1.getEnvConfig)().DEVCHAIN_HOST_ETC_DIR, 'claim.json'))) {
+            this.warnedUnprivilegedHost = true;
+            logger.warn('Syncthing lacks ownership capabilities on this claimed VM; update the VM to sync files owned by other users');
+        }
         this.throwIfStopping();
         await instance.client.patchOptions({
             listenAddresses: [instance.listenAddress],
@@ -204,13 +217,16 @@ let SyncthingManager = class SyncthingManager {
         if (await instance.client.restartRequired()) {
             throw new Error('Syncthing needs a restart to apply its options');
         }
-        if (!this.transcriptFoldersRemoved) {
-            const folders = zod_1.z
-                .array(zod_1.z.object({ id: zod_1.z.string() }))
-                .parse(await instance.client.request('GET', '/rest/config/folders'));
-            for (const folder of folders) {
-                if (!folder.id.startsWith('tx:'))
-                    continue;
+        const folders = zod_1.z
+            .array(zod_1.z.object({ id: zod_1.z.string(), copyOwnershipFromParent: zod_1.z.boolean().optional() }))
+            .parse(await instance.client.request('GET', '/rest/config/folders'));
+        for (const folder of folders) {
+            if ((0, file_sync_dto_1.isProjectFolderId)(folder.id)) {
+                if (folder.copyOwnershipFromParent !== privileged) {
+                    await instance.client.request('PATCH', `/rest/config/folders/${encodeURIComponent(folder.id)}`, { copyOwnershipFromParent: privileged });
+                }
+            }
+            else if (!this.transcriptFoldersRemoved && folder.id.startsWith('tx:')) {
                 try {
                     await instance.client.request('DELETE', `/rest/config/folders/${encodeURIComponent(folder.id)}`);
                 }
@@ -219,8 +235,8 @@ let SyncthingManager = class SyncthingManager {
                         throw error;
                 }
             }
-            this.transcriptFoldersRemoved = true;
         }
+        this.transcriptFoldersRemoved = true;
         instance.deviceId = await instance.client.deviceId();
         this.throwIfStopping();
         instance.readyAt = Date.now();
@@ -310,7 +326,7 @@ let SyncthingManager = class SyncthingManager {
         if (instance.readyAt !== null && Date.now() - instance.readyAt >= this.timings.stableAfterMs) {
             this.failures = 0;
         }
-        this.state = { ...this.state, running: false, error: reason };
+        this.state = { ...this.state, running: false, privileged: false, error: reason };
         logger.warn({ reason }, 'Syncthing stopped; restarting');
         await this.kill(instance);
         this.scheduleRestart();

package/dist/server/modules/file-sync/syncthing-manager.service.js.map

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

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

@@ -1,12 +1,13 @@
-import type { FolderSyncStatus, FolderType, SyncDevice, SyncFolder, SyncFolderPatch, SyncFolderRequest } from '../file-sync.dto';
+import type { FolderSyncStatus, RemoteNeed, ConflictReport, ConflictBaseline, FolderType, SyncDevice, SyncFolder, SyncFolderPatch, SyncFolderRequest, ForceCopyBackupRequest, ForceCopyBackup, ReceiveOnlyChanges, SyncStatusOptions } from '../file-sync.dto';
 import { FileSyncService, type FolderNeed, type ProjectFolder, type SyncProgress, type WaitForCompleteOptions } from '../file-sync.service';
 export interface FakeFolder {
     type: FolderType;
     paused: boolean;
     peerDeviceId: string;
     ignores: string[];
+    backupPath?: string;
 }
-export declare class FakeFileSyncService implements Pick<FileSyncService, 'device' | 'addPeer' | 'isConnected' | 'getIgnores' | 'setIgnores' | 'projectFolders' | 'initialFolders' | 'projectNeed' | 'ensureFolder' | 'updateFolder' | 'setFolderType' | 'folderConfiguration' | 'folderPath' | 'removeFolder' | 'status' | 'rescan' | 'revertLocalChanges' | 'waitForComplete'> {
+export declare class FakeFileSyncService implements Pick<FileSyncService, 'device' | 'addPeer' | 'isConnected' | 'getIgnores' | 'getIgnoresRevision' | 'setIgnores' | 'projectFolders' | 'initialFolders' | 'projectNeed' | 'ensureFolder' | 'forceCopyBackup' | 'localChanges' | 'override' | 'updateFolder' | 'setFolderType' | 'folderConfiguration' | 'installedIgnores' | 'folderPath' | 'removeFolder' | 'status' | 'remoteNeed' | 'conflicts' | 'conflictBaseline' | 'rescan' | 'revertLocalChanges' | 'waitForComplete'> {
     readonly deviceId: string;
     readonly peers: Set<string>;
     readonly gitProjects: Set<string>;
@@ -15,18 +16,35 @@ export declare class FakeFileSyncService implements Pick<FileSyncService, 'devic
         needItems: number;
         needBytes: number;
     }>;
+    readonly remoteNeeds: Map<string, {
+        deleted: number;
+        sample: {
+            path: string;
+            deleted: boolean;
+        }[];
+        total: number;
+        conflictPaths: string[];
+        conflictsOverCap: boolean;
+    }>;
+    readonly receiveOnlyChanges: Map<string, {
+        count: number;
+        sample: string[];
+    }>;
     readonly codeRoots: Map<string, string>;
     private readonly ignores;
+    private readonly revisions;
     ensureAvailable(): Promise<void>;
     device(): SyncDevice;
     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>;
     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";
@@ -35,12 +53,20 @@ export declare class FakeFileSyncService implements Pick<FileSyncService, 'devic
             deviceID: string;
         }[];
     }>;
+    installedIgnores(folderId: string): Promise<{
+        ignore: string[];
+    }>;
     folderPath(projectId: string, kind?: ProjectFolder['kind']): Promise<string>;
     setFolderType(folderId: string, type: FolderType): Promise<void>;
     removeFolder(folderId: string): Promise<void>;
-    status(folderId: string, peerDeviceId?: string): Promise<FolderSyncStatus>;
+    status(folderId: string, peerDeviceId?: string, _options?: SyncStatusOptions): Promise<FolderSyncStatus>;
     rescan(folderId: string, signal?: AbortSignal): Promise<void>;
+    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>;
     revertLocalChanges(folderId: string): Promise<void>;
+    localChanges(folderId: string): Promise<ReceiveOnlyChanges>;
+    override(folderId: string): Promise<void>;
     waitForComplete(folderId: string, options: WaitForCompleteOptions): Promise<SyncProgress>;
     private require;
 }

package/dist/server/modules/file-sync/testing/fake-file-sync.service.js

@@ -2,10 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FakeFileSyncService = void 0;
 const crypto_1 = require("crypto");
+const error_types_1 = require("../../../common/errors/error-types");
 const path_1 = require("path");
+const file_sync_dto_1 = require("../file-sync.dto");
 const file_sync_service_1 = require("../file-sync.service");
 const syncthing_rest_client_1 = require("../syncthing-rest.client");
 const file_sync_ignores_store_1 = require("../file-sync-ignores.store");
+const file_sync_conflicts_1 = require("../file-sync-conflicts");
 class FakeFileSyncService {
     deviceId = Array.from({ length: 8 }, () => (0, crypto_1.randomBytes)(7)
         .toString('base64')
@@ -17,8 +20,11 @@ class FakeFileSyncService {
     gitProjects = new Set();
     folders = new Map();
     need = new Map();
+    remoteNeeds = new Map();
+    receiveOnlyChanges = new Map();
     codeRoots = new Map();
     ignores = new Map();
+    revisions = new Map();
     async ensureAvailable() { }
     device() {
         return { deviceId: this.deviceId, address: 'tcp://127.0.0.1:22000' };
@@ -32,7 +38,14 @@ class FakeFileSyncService {
     getIgnores(projectId) {
         return this.ignores.get(projectId) ?? [...file_sync_ignores_store_1.DEFAULT_FILE_SYNC_IGNORES];
     }
-    setIgnores(projectId, ignores) {
+    getIgnoresRevision(projectId) {
+        return this.revisions.get(projectId) ?? 0;
+    }
+    setIgnores(projectId, ignores, revision) {
+        const current = this.getIgnoresRevision(projectId);
+        if (revision !== undefined && revision !== current)
+            throw new error_types_1.AppError('The file list changed. Review it again.', file_sync_dto_1.FILE_SYNC_IGNORES_CHANGED, 409);
+        this.revisions.set(projectId, current + 1);
         if (ignores === null)
             this.ignores.delete(projectId);
         else
@@ -54,13 +67,32 @@ class FakeFileSyncService {
     async ensureFolder(request) {
         const id = (0, file_sync_service_1.projectFolderId)(request.projectId, request.kind);
         const paused = request.paused ?? false;
+        const backupPath = request.forceCopy
+            ? (await this.forceCopyBackup({
+                projectId: request.projectId,
+                kind: request.kind,
+                forceCopy: request.forceCopy,
+            })).path
+            : undefined;
         this.folders.set(id, {
             type: request.type,
             paused,
             peerDeviceId: request.peerDeviceId,
             ignores: request.ignores,
+            ...(backupPath && { backupPath }),
         });
-        return { id, path: `/fake/${id}`, type: request.type, paused };
+        return {
+            id,
+            path: `/fake/${id}`,
+            type: request.type,
+            paused,
+            ...(backupPath && { backupPath }),
+        };
+    }
+    async forceCopyBackup(request) {
+        return {
+            path: `/fake/sync-backups/${request.projectId}/${request.forceCopy.operationId}/${request.kind}`,
+        };
     }
     async updateFolder(folderId, patch) {
         const folder = this.require(folderId);
@@ -74,6 +106,9 @@ class FakeFileSyncService {
             devices: [{ deviceID: this.deviceId }, { deviceID: folder.peerDeviceId }],
         };
     }
+    async installedIgnores(folderId) {
+        return { ignore: [...this.require(folderId).ignores] };
+    }
     async folderPath(projectId, kind = 'code') {
         const root = this.codeRoots.get(projectId) ?? `/fake/${projectId}`;
         return kind === 'git' ? (0, path_1.join)(root, '.git') : root;
@@ -84,7 +119,7 @@ class FakeFileSyncService {
     async removeFolder(folderId) {
         this.folders.delete(folderId);
     }
-    async status(folderId, peerDeviceId) {
+    async status(folderId, peerDeviceId, _options) {
         this.require(folderId);
         const need = this.need.get(folderId) ?? zeroNeed();
         return {
@@ -96,7 +131,7 @@ class FakeFileSyncService {
             globalDirectories: 1,
             needTotalItems: need.needItems,
             needBytes: need.needBytes,
-            receiveOnlyChangedFiles: 0,
+            receiveOnlyChangedFiles: this.receiveOnlyChanges.get(folderId)?.count ?? 0,
             peer: peerDeviceId
                 ? {
                     deviceId: peerDeviceId,
@@ -112,8 +147,38 @@ class FakeFileSyncService {
         this.require(folderId);
         signal?.throwIfAborted();
     }
+    async remoteNeed(folderId, _peerDeviceId) {
+        this.require(folderId);
+        return structuredClone(this.remoteNeeds.get(folderId) ?? {
+            total: 0,
+            deleted: 0,
+            sample: [],
+            conflictPaths: [],
+            conflictsOverCap: false,
+        });
+    }
+    async conflicts(projectId, baseline, ignores, signal) {
+        const root = this.codeRoots.get(projectId);
+        return root
+            ? (0, file_sync_conflicts_1.scanFileSyncConflicts)(root, baseline, ignores, signal)
+            : { total: 0, sample: [], ...(baseline.baselineOverCap && { baselineOverCap: true }) };
+    }
+    async conflictBaseline(projectId, ignores, signal) {
+        const root = this.codeRoots.get(projectId);
+        return root
+            ? (0, file_sync_conflicts_1.captureFileSyncConflictBaseline)(root, ignores, signal)
+            : { baselineOverCap: false, paths: [] };
+    }
     async revertLocalChanges(folderId) {
         this.require(folderId);
+        this.receiveOnlyChanges.delete(folderId);
+    }
+    async localChanges(folderId) {
+        this.require(folderId);
+        return structuredClone(this.receiveOnlyChanges.get(folderId) ?? { count: 0, sample: [] });
+    }
+    async override(folderId) {
+        this.require(folderId);
     }
     waitForComplete(folderId, options) {
         return file_sync_service_1.FileSyncService.prototype.waitForComplete.call(this, folderId, {

package/dist/server/modules/file-sync/testing/fake-file-sync.service.js.map

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

package/dist/server/modules/file-sync/testing/fake-syncthing-launcher.d.ts

@@ -30,9 +30,11 @@ export declare class FakeSyncthingLauncher extends SyncthingLauncher {
     lookup: SyncthingBinaryLookup;
     onShutdown: 'exit' | 'ignore';
     restartRequired: boolean[];
+    privileged: boolean;
     folders: Array<{
         id: string;
         path?: string;
+        copyOwnershipFromParent?: boolean;
     }>;
     readonly runs: FakeSyncthingRun[];
     readonly kills: number[];
@@ -41,6 +43,7 @@ export declare class FakeSyncthingLauncher extends SyncthingLauncher {
     spawn(_binaryPath: string, args: string[], env: Record<string, string>): Promise<FakeSyncthingRun>;
     spawnRun(args: string[], env: Record<string, string>): FakeSyncthingRun;
     findChildPid(pid: number): Promise<number | null>;
+    hasOwnershipCapabilities(_pid: number): Promise<boolean>;
     isAlive(pid: number): boolean;
     kill(pid: number): void;
     get last(): FakeSyncthingRun;

package/dist/server/modules/file-sync/testing/fake-syncthing-launcher.js

@@ -59,6 +59,7 @@ class FakeSyncthingLauncher extends syncthing_launcher_1.SyncthingLauncher {
     lookup = { found: true, path: '/fake/syncthing', version: 'v2.1.5' };
     onShutdown = 'exit';
     restartRequired = [];
+    privileged = false;
     folders = [];
     runs = [];
     kills = [];
@@ -90,6 +91,13 @@ class FakeSyncthingLauncher extends syncthing_launcher_1.SyncthingLauncher {
                     return json({ myID: deviceIdFor(run.home) });
                 if (route === 'GET /rest/config/folders')
                     return json(this.folders);
+                if (req.method === 'PATCH' && path.startsWith('/rest/config/folders/')) {
+                    const folder = this.folders.find((f) => f.id === decodeURIComponent(path.slice('/rest/config/folders/'.length)));
+                    if (!folder)
+                        return res.writeHead(404).end();
+                    Object.assign(folder, body);
+                    return json({});
+                }
                 if (req.method === 'DELETE' && path.startsWith('/rest/config/folders/')) {
                     this.folders = this.folders.filter((f) => f.id !== decodeURIComponent(path.slice('/rest/config/folders/'.length)));
                     return json({});
@@ -116,6 +124,9 @@ class FakeSyncthingLauncher extends syncthing_launcher_1.SyncthingLauncher {
         const run = this.runs.find((r) => r.pid === pid);
         return Promise.resolve(run?.childAlive ? run.childPid : null);
     }
+    hasOwnershipCapabilities(_pid) {
+        return Promise.resolve(this.privileged);
+    }
     isAlive(pid) {
         return this.runs.some((r) => (r.pid === pid && r.parentAlive) || (r.childPid === pid && r.childAlive));
     }

package/dist/server/modules/file-sync/testing/fake-syncthing-launcher.js.map

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

package/dist/server/modules/file-sync/translate-git-ignore-rule.d.ts

@@ -0,0 +1,3 @@
+import { type SyncPathFacts } from './sync-path-inspection.dto';
+export declare function nestedGitignoreBase(source: string): string | null;
+export declare function translateGitIgnoreRule(rule: NonNullable<SyncPathFacts['ignoreRule']>): string[] | null;

package/dist/server/modules/file-sync/translate-git-ignore-rule.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.nestedGitignoreBase = nestedGitignoreBase;
+exports.translateGitIgnoreRule = translateGitIgnoreRule;
+const ignore_pattern_matcher_1 = require("./ignore-pattern-matcher");
+const sync_path_inspection_dto_1 = require("./sync-path-inspection.dto");
+function nestedGitignoreBase(source) {
+    return source.endsWith('/.gitignore') && sync_path_inspection_dto_1.SyncRelativePathSchema.safeParse(source).success
+        ? source.slice(0, -'/.gitignore'.length)
+        : null;
+}
+function translateGitIgnoreRule(rule) {
+    let pattern = rule.pattern;
+    if (pattern.startsWith('!') || !/^[A-Za-z0-9._ /\-*?\[\]\\]+$/.test(pattern))
+        return null;
+    if (pattern.includes('/**/') || pattern.includes('[^') || pattern.endsWith('\\'))
+        return null;
+    pattern = pattern.replace(/\/$/, '').replace(/^\*\*\//, '');
+    if (!pattern)
+        return null;
+    const base = nestedGitignoreBase(rule.source) ?? '';
+    const rootedBase = base ? `${base.replace(/[\\*?\[\]{}]/g, '\\$&')}/` : '';
+    const patterns = pattern.includes('/')
+        ? [`(?d)/${rootedBase}${pattern.replace(/^\//, '')}`]
+        : base
+            ? [`(?d)/${rootedBase}${pattern}`, `(?d)/${rootedBase}**/${pattern}`]
+            : [`(?d)${pattern}`];
+    return patterns.every((line) => (0, ignore_pattern_matcher_1.compileIgnorePattern)(line).kind === 'pattern') ? patterns : null;
+}
+//# sourceMappingURL=translate-git-ignore-rule.js.map

package/dist/server/modules/file-sync/translate-git-ignore-rule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"translate-git-ignore-rule.js","sourceRoot":"","sources":["../../../src/modules/file-sync/translate-git-ignore-rule.ts"],"names":[],"mappings":";;AAIA,kDAIC;AAED,wDAgBC;AA1BD,qEAAgE;AAChE,yEAAwF;AAGxF,SAAgB,mBAAmB,CAAC,MAAc;IAChD,OAAO,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,iDAAsB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,OAAO;QACvF,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC;QACxC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC;AAED,SAAgB,sBAAsB,CACpC,IAA8C;IAE9C,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAC3B,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,8BAA8B,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IAC1F,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAC9F,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IAC5D,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAC1B,MAAM,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACpD,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3E,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;QACpC,CAAC,CAAC,CAAC,QAAQ,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC;QACrD,CAAC,CAAC,IAAI;YACJ,CAAC,CAAC,CAAC,QAAQ,UAAU,GAAG,OAAO,EAAE,EAAE,QAAQ,UAAU,MAAM,OAAO,EAAE,CAAC;YACrE,CAAC,CAAC,CAAC,OAAO,OAAO,EAAE,CAAC,CAAC;IACzB,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,6CAAoB,EAAC,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;AACnG,CAAC"}

package/dist/server/modules/git/dtos/git.dto.d.ts

@@ -35,12 +35,12 @@ export declare const GetDiffQuerySchema: z.ZodObject<{
     head: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     projectId: string;
-    base: string;
     head: string;
+    base: string;
 }, {
     projectId: string;
-    base: string;
     head: string;
+    base: string;
 }>;
 export type GetDiffQueryDto = z.infer<typeof GetDiffQuerySchema>;
 export declare const GetChangedFilesQuerySchema: z.ZodObject<{
@@ -49,12 +49,12 @@ export declare const GetChangedFilesQuerySchema: z.ZodObject<{
     head: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     projectId: string;
-    base: string;
     head: string;
+    base: string;
 }, {
     projectId: string;
-    base: string;
     head: string;
+    base: string;
 }>;
 export type GetChangedFilesQueryDto = z.infer<typeof GetChangedFilesQuerySchema>;
 export declare const WorkingTreeQuerySchema: z.ZodObject<{

package/dist/server/modules/git/services/git.service.d.ts

@@ -1,4 +1,4 @@
-import { StorageService } from '../../storage/interfaces/storage.interface';
+import { type ProjectStorage } from '../../storage/interfaces/storage.interface';
 import { ProcessExecutor } from '../../terminal/services/process-executor/process-executor.port';
 export interface Commit {
     sha: string;
@@ -50,9 +50,10 @@ export interface WorkingTreeData {
 export declare class GitService {
     private readonly storage;
     private readonly executor;
-    constructor(storage: StorageService, executor: ProcessExecutor);
+    constructor(storage: ProjectStorage, executor: ProcessExecutor);
     private execGit;
     private validatePathWithinProject;
+    private validateRef;
     resolveRef(projectId: string, ref: string): Promise<string>;
     listCommits(projectId: string, options?: {
         limit?: number;