devchain-cli 0.24.1 → 0.25.0

package/dist/server/modules/remotes/operations/docker-import-inventory.store.js

@@ -12,15 +12,39 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DockerImportInventoryStore = exports.DockerImportInventorySchema = exports.DockerDataGroupRecordSchema = void 0;
+exports.DockerImportInventoryStore = exports.DockerImportInventorySchema = exports.DockerDataGroupRecordSchema = exports.DockerDataRepresentationSchema = exports.DockerOwnershipRecordSchema = void 0;
 exports.vmImageCandidates = vmImageCandidates;
+exports.inventoryBindPaths = inventoryBindPaths;
+exports.connectExclusions = connectExclusions;
 const common_1 = require("@nestjs/common");
 const zod_1 = require("zod");
 const logger_1 = require("../../../common/logging/logger");
 const db_provider_1 = require("../../storage/db/db.provider");
 const sqlite_raw_1 = require("../../storage/db/sqlite-raw");
+const docker_plan_files_1 = require("../docker/docker-plan-files");
 const logger = (0, logger_1.createLogger)('DockerImportInventoryStore');
 const SETTINGS_KEY = 'docker.importInventory';
+const userIds = zod_1.z
+    .object({ uid: zod_1.z.number().int().nonnegative(), gid: zod_1.z.number().int().nonnegative() })
+    .strict();
+exports.DockerOwnershipRecordSchema = zod_1.z
+    .object({
+    class: zod_1.z.enum(['exact', 'follows-user', 'needs-user-fix', 'image-user-hint']),
+    home: userIds,
+    vm: userIds,
+    targetUser: zod_1.z.string().max(4096).optional(),
+})
+    .strict();
+exports.DockerDataRepresentationSchema = zod_1.z
+    .object({ kind: zod_1.z.enum(['exact', 'mapped']), home: userIds, vm: userIds })
+    .strict();
+const DataRepresentationGroupSchema = zod_1.z
+    .object({
+    volumes: zod_1.z.array(zod_1.z.string().min(1).max(255)).max(1000),
+    bindPaths: zod_1.z.array(zod_1.z.string().min(1).max(4096)).max(1000),
+    representation: exports.DockerDataRepresentationSchema.optional(),
+})
+    .strict();
 const InventoryVolumeSchema = zod_1.z
     .object({
     name: zod_1.z.string().min(1).max(255),
@@ -30,6 +54,8 @@ const InventoryVolumeSchema = zod_1.z
 const InventoryItemSchema = zod_1.z
     .object({
     name: zod_1.z.string().min(1).max(255),
+    ownership: exports.DockerOwnershipRecordSchema.optional(),
+    dataRepresentations: zod_1.z.array(DataRepresentationGroupSchema).max(1000).optional(),
     imageId: zod_1.z.string().min(1).max(255),
     vmImageId: zod_1.z.string().min(1).max(255).optional(),
     volumes: zod_1.z.array(InventoryVolumeSchema).max(1000),
@@ -41,6 +67,8 @@ exports.DockerDataGroupRecordSchema = zod_1.z
     .object({
     volumes: zod_1.z.array(zod_1.z.string().min(1).max(255)).max(1000),
     bindPaths: zod_1.z.array(zod_1.z.string().min(1).max(4096)).max(1000),
+    ownership: exports.DockerOwnershipRecordSchema.optional(),
+    representation: exports.DockerDataRepresentationSchema.optional(),
     lastSyncedAt: zod_1.z.string().datetime().optional(),
     lastSyncDirection: zod_1.z.enum(['to-vm', 'to-home']).optional(),
     homeDiscardedAt: zod_1.z.string().datetime().optional(),
@@ -60,6 +88,25 @@ function vmImageCandidates(inventory, homeId) {
     const paired = (inventory?.items ?? []).flatMap((item) => item.imageId === homeId && item.vmImageId ? [item.vmImageId] : []);
     return [...new Set([homeId, ...paired])];
 }
+function inventoryBindPaths(inventory, projectRoot) {
+    return [
+        ...new Set([
+            ...(inventory?.items.flatMap((item) => item.bindPaths) ?? []),
+            ...(inventory?.groups ?? [])
+                .flatMap((group) => group.bindPaths)
+                .filter((path) => (0, docker_plan_files_1.strictlyWithin)(projectRoot, path))
+                .map((path) => (0, docker_plan_files_1.projectAnchoredPath)(projectRoot, path)),
+        ]),
+    ];
+}
+function connectExclusions(plan, inventory, projectRoot) {
+    return [
+        ...new Set([
+            ...plan.managedExclusions,
+            ...inventoryBindPaths(inventory, projectRoot).filter((path) => !plan.codePaths.includes(path)),
+        ]),
+    ];
+}
 let DockerImportInventoryStore = class DockerImportInventoryStore {
     sqlite;
     constructor(db) {

package/dist/server/modules/remotes/operations/docker-import-inventory.store.js.map

@@ -1 +1 @@
-{"version":3,"file":"docker-import-inventory.store.js","sourceRoot":"","sources":["../../../../src/modules/remotes/operations/docker-import-inventory.store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"docker-import-inventory.store.js","sourceRoot":"","sources":["../../../../src/modules/remotes/operations/docker-import-inventory.store.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/remotes/operations/file-sync-handoff.d.ts

@@ -1,7 +1,9 @@
+import { GitOwnerStore, type GitOwner } from '../git-owner.store';
 import { AppError } from '../../../common/errors/error-types';
-import { FileSyncService, type FolderNeed, type SyncProgress } from '../../file-sync/file-sync.service';
+import { FileSyncService, type FolderNeed, type ProjectFolder, type SyncProgress } from '../../file-sync/file-sync.service';
 import { FileSyncManagedExclusionsStore } from '../../file-sync/file-sync-managed-exclusions.store';
 import { HomeGitGuardService } from '../../file-sync/home-git-guard.service';
+import { ProcessExecutor } from '../../terminal/services/process-executor/process-executor.port';
 import { RemoteHostClient } from './remote-host.client';
 import type { RemoteOperationStepRun } from './remote-operation.types';
 export interface FileSyncDetails {
@@ -13,17 +15,40 @@ export type FileSyncLoss = {
 export declare class FileSyncNotConnectedError extends AppError {
     constructor(address: string);
 }
+export interface ForceSyncDetails {
+    backups: {
+        side: 'home' | 'vm';
+        kind: ProjectFolder['kind'];
+        path: string;
+    }[];
+    replaced?: {
+        count: number;
+        sample: string[];
+    };
+    verified: boolean;
+}
 export declare class FileSyncHandoff {
     private readonly fileSync;
     private readonly host;
     private readonly managedExclusions;
     private readonly guard;
+    private readonly processExecutor;
+    private readonly gitOwner;
     private readonly active;
-    constructor(fileSync: FileSyncService, host: RemoteHostClient, managedExclusions: FileSyncManagedExclusionsStore, guard: HomeGitGuardService);
-    interrupt(operationId: string): void;
+    constructor(fileSync: FileSyncService, host: RemoteHostClient, managedExclusions: FileSyncManagedExclusionsStore, guard: HomeGitGuardService, processExecutor: ProcessExecutor, gitOwner: GitOwnerStore);
+    interrupt(operationId: string, reason?: string): void;
     initial(run: RemoteOperationStepRun, projectId: string): Promise<void>;
     ensureAvailable(): Promise<void>;
+    ensureRepository(projectId: string): Promise<boolean>;
     flipToHost(run: RemoteOperationStepRun, projectId: string): Promise<void>;
+    settleGit(run: RemoteOperationStepRun, projectId: string, owner: GitOwner): Promise<void>;
+    flipGit(run: RemoteOperationStepRun, projectId: string, owner: GitOwner): Promise<void>;
+    forceCopy(run: RemoteOperationStepRun, projectId: string, source: 'home' | 'vm', kinds: readonly ProjectFolder['kind'][]): Promise<void>;
+    restoreConnected(run: RemoteOperationStepRun, projectId: string, kinds: readonly ProjectFolder['kind'][]): Promise<void>;
+    private forceDetails;
+    private forceProgress;
+    private waitBarrier;
+    private verifyForceCopy;
     final(run: RemoteOperationStepRun, projectId: string): Promise<void>;
     flipToHome(run: RemoteOperationStepRun, projectId: string, force: boolean): Promise<void>;
     removeFolders(remoteId: string, projectId: string): Promise<string | null>;
@@ -34,6 +59,7 @@ export declare class FileSyncHandoff {
     private deleteHomeTempFiles;
     private pair;
     private unpauseAll;
+    private waitHostIdle;
     private waitAll;
     private update;
     private status;