devchain-cli 0.23.4 → 0.24.1

package/dist/server/modules/core/controllers/host-stats.controller.js

@@ -0,0 +1,139 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HostStatsController = void 0;
+const common_1 = require("@nestjs/common");
+const swagger_1 = require("@nestjs/swagger");
+const os = __importStar(require("node:os"));
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
+const db_config_1 = require("../../storage/db/db.config");
+const logger_1 = require("../../../common/logging/logger");
+const logger = (0, logger_1.createLogger)('HostStatsController');
+const CPU_SAMPLE_WINDOW_MS = 100;
+const CPU_BASELINE_MIN_AGE_MS = 1000;
+const CPU_BASELINE_MAX_AGE_MS = 60000;
+function readCpuTimeTotals() {
+    return os.cpus().reduce((acc, cpu) => {
+        acc.idle += cpu.times.idle;
+        acc.total += cpu.times.user + cpu.times.nice + cpu.times.sys + cpu.times.idle + cpu.times.irq;
+        return acc;
+    }, { idle: 0, total: 0 });
+}
+function busyPercentBetween(start, end) {
+    const idleDelta = end.idle - start.idle;
+    const totalDelta = end.total - start.total;
+    if (totalDelta <= 0)
+        return null;
+    return Math.max(0, Math.min(100, ((totalDelta - idleDelta) / totalDelta) * 100));
+}
+let HostStatsController = class HostStatsController {
+    previousCpuTotals = null;
+    async getStats() {
+        const [cpuPercent, disk] = await Promise.all([this.readCpuPercent(), this.readDiskStats()]);
+        const [load1, load5] = os.loadavg();
+        const memTotalBytes = os.totalmem();
+        const memUsedBytes = memTotalBytes - os.freemem();
+        return {
+            cpuPercent: Math.round(cpuPercent * 100) / 100,
+            load1,
+            load5,
+            memTotalBytes,
+            memUsedBytes,
+            diskTotalBytes: disk.total,
+            diskUsedBytes: disk.used,
+            diskAvailBytes: disk.avail,
+            uptimeSec: Math.floor(os.uptime()),
+            sampledAt: new Date().toISOString(),
+        };
+    }
+    async readCpuPercent() {
+        const totals = readCpuTimeTotals();
+        const now = Date.now();
+        const previous = this.previousCpuTotals;
+        this.previousCpuTotals = { totals, at: now };
+        if (previous) {
+            const ageMs = now - previous.at;
+            if (ageMs >= CPU_BASELINE_MIN_AGE_MS && ageMs <= CPU_BASELINE_MAX_AGE_MS) {
+                const average = busyPercentBetween(previous.totals, totals);
+                if (average !== null)
+                    return average;
+            }
+        }
+        return this.sampleCpuOverWindow();
+    }
+    async sampleCpuOverWindow() {
+        const start = readCpuTimeTotals();
+        await new Promise((resolve) => setTimeout(resolve, CPU_SAMPLE_WINDOW_MS));
+        return busyPercentBetween(start, readCpuTimeTotals()) ?? 0;
+    }
+    async readDiskStats() {
+        try {
+            const dataDir = (0, node_path_1.dirname)((0, db_config_1.getDbConfig)().dbPath);
+            const stats = await (0, promises_1.statfs)(dataDir);
+            const total = stats.blocks * stats.bsize;
+            const free = stats.bfree * stats.bsize;
+            const avail = stats.bavail * stats.bsize;
+            return { total, used: Math.max(0, total - free), avail };
+        }
+        catch (error) {
+            logger.warn({ error: String(error) }, 'Failed to read disk stats for the data directory');
+            return { total: 0, used: 0, avail: 0 };
+        }
+    }
+};
+exports.HostStatsController = HostStatsController;
+__decorate([
+    (0, common_1.Get)('stats'),
+    (0, swagger_1.ApiOperation)({ summary: 'Get this instance host resource stats' }),
+    (0, swagger_1.ApiResponse)({ status: 200, description: 'Host resource stats' }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], HostStatsController.prototype, "getStats", null);
+exports.HostStatsController = HostStatsController = __decorate([
+    (0, swagger_1.ApiTags)('host'),
+    (0, common_1.Controller)('api/host')
+], HostStatsController);
+//# sourceMappingURL=host-stats.controller.js.map

package/dist/server/modules/core/controllers/host-stats.controller.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"host-stats.controller.js","sourceRoot":"","sources":["../../../../src/modules/core/controllers/host-stats.controller.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/core/controllers/runtime.controller.d.ts

@@ -1,23 +1,58 @@
-import { ModuleRef } from '@nestjs/core';
-import { OrchestratorDockerService } from '../../orchestrator/docker/services/docker.service';
+import { ProviderCliInstallStateService } from '../../providers/services/provider-cli-install-state.service';
+import { SyncthingManager } from '../../file-sync/syncthing-manager.service';
+import { type HostEnvOverrideReportStorage } from '../../remotes/host/host-env-override-report';
 export declare class RuntimeController {
-    private readonly dockerService?;
-    private readonly moduleRef?;
-    private dockerAvailabilityCache;
-    private dockerAvailabilityPending;
-    private resolvedDockerService?;
-    constructor(dockerService?: OrchestratorDockerService | undefined, moduleRef?: ModuleRef | undefined);
+    private readonly syncthing;
+    private readonly providerClis;
+    private readonly storage;
+    constructor(syncthing: SyncthingManager, providerClis: ProviderCliInstallStateService, storage: HostEnvOverrideReportStorage);
     getRuntime(): Promise<{
         runtimeToken?: string | undefined;
-        mode: "normal" | "main";
         version: string;
+        homePath: string;
+        uid: number | null;
+        gid: number | null;
         bootId: string;
-        dockerAvailable: boolean;
         features: {
             cloudUi: boolean;
         };
-        integrationAdmission: import("../../../common/config/container-scope").IntegrationAdmission;
+        integrationAdmission: import("../../../common/config/integration-admission").IntegrationAdmission;
+        fileSync: import("../../file-sync/syncthing-manager.service").SyncthingState;
+        cliVersions: Record<string, string> | null;
+        providerClis: {
+            [k: string]: {
+                desiredVersion: string;
+                installedVersion: string | null;
+                state: "idle" | "installing" | "failed";
+                error: string | null;
+                checkedAt: string | null;
+            };
+        };
+        docker: {
+            installed: boolean;
+            engineVersion: string | null;
+            composeVersion: string | null;
+            userInGroup: boolean;
+            dataRootFreeBytes: number | null;
+            capacity?: {
+                dockerRoot: {
+                    path: string;
+                    filesystemId: string;
+                    freeBytes: number;
+                } | null;
+                imageStore: {
+                    path: string;
+                    filesystemId: string;
+                    freeBytes: number;
+                } | null;
+                home: {
+                    path: string;
+                    filesystemId: string;
+                    freeBytes: number;
+                } | null;
+            } | undefined;
+        };
+        build: import("./build-info").BuildInfo | null;
+        providerEnvOverrides: import("../../remotes/host/host-env-override-report").HostEnvOverrideEntry[];
     }>;
-    private resolveDockerService;
-    private resolveDockerAvailability;
 }

package/dist/server/modules/core/controllers/runtime.controller.js

@@ -13,117 +13,63 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RuntimeController = void 0;
+const shared_1 = require("@devchain/shared");
+const provider_cli_install_state_service_1 = require("../../providers/services/provider-cli-install-state.service");
+const docker_runtime_1 = require("./docker-runtime");
 const common_1 = require("@nestjs/common");
-const core_1 = require("@nestjs/core");
+const node_os_1 = require("node:os");
 const swagger_1 = require("@nestjs/swagger");
-const fs_1 = require("fs");
-const path_1 = require("path");
-const container_scope_1 = require("../../../common/config/container-scope");
+const app_version_1 = require("../../../common/app-version");
+const integration_admission_1 = require("../../../common/config/integration-admission");
 const env_config_1 = require("../../../common/config/env.config");
 const process_identity_1 = require("../../../common/process-identity");
-const docker_service_1 = require("../../orchestrator/docker/services/docker.service");
-function getVersion() {
-    try {
-        const possiblePaths = [
-            (0, path_1.join)(__dirname, '..', '..', '..', '..', '..', 'package.json'),
-            (0, path_1.join)(__dirname, '..', '..', '..', '..', '..', '..', 'package.json'),
-            (0, path_1.join)(process.cwd(), 'package.json'),
-        ];
-        for (const pkgPath of possiblePaths) {
-            if (!(0, fs_1.existsSync)(pkgPath)) {
-                continue;
-            }
-            const pkg = JSON.parse((0, fs_1.readFileSync)(pkgPath, 'utf-8'));
-            if (pkg.name === 'devchain-cli' && pkg.version) {
-                return pkg.version;
-            }
-        }
-    }
-    catch {
-    }
-    return 'unknown';
-}
+const storage_interface_1 = require("../../storage/interfaces/storage.interface");
+const syncthing_manager_service_1 = require("../../file-sync/syncthing-manager.service");
+const host_env_override_report_1 = require("../../remotes/host/host-env-override-report");
+const build_info_1 = require("./build-info");
+const host_cli_versions_1 = require("./host-cli-versions");
 let RuntimeController = class RuntimeController {
-    dockerService;
-    moduleRef;
-    dockerAvailabilityCache = null;
-    dockerAvailabilityPending = null;
-    resolvedDockerService;
-    constructor(dockerService, moduleRef) {
-        this.dockerService = dockerService;
-        this.moduleRef = moduleRef;
+    syncthing;
+    providerClis;
+    storage;
+    constructor(syncthing, providerClis, storage) {
+        this.syncthing = syncthing;
+        this.providerClis = providerClis;
+        this.storage = storage;
     }
     async getRuntime() {
         const env = (0, env_config_1.getEnvConfig)();
         const runtimeToken = typeof env.RUNTIME_TOKEN === 'string' && env.RUNTIME_TOKEN.trim().length > 0
             ? env.RUNTIME_TOKEN.trim()
             : undefined;
+        const [docker, providerEnvOverrides] = await Promise.all([
+            (0, docker_runtime_1.readDockerRuntime)(),
+            (0, host_env_override_report_1.readHostEnvOverrideReport)(this.storage),
+        ]);
         return {
-            mode: env.DEVCHAIN_MODE,
-            version: getVersion(),
+            version: (0, app_version_1.getAppVersion)(),
+            homePath: (0, node_os_1.homedir)(),
+            uid: process.getuid?.() ?? null,
+            gid: process.getgid?.() ?? null,
             bootId: process_identity_1.PROCESS_BOOT_ID,
-            dockerAvailable: await this.resolveDockerAvailability(env.DEVCHAIN_MODE),
             features: {
                 cloudUi: env.DEVCHAIN_CLOUD_UI_ENABLED,
             },
-            integrationAdmission: (0, container_scope_1.getIntegrationAdmission)(env),
+            integrationAdmission: (0, integration_admission_1.getIntegrationAdmission)(env),
+            fileSync: this.syncthing.getState(),
+            cliVersions: (0, host_cli_versions_1.readHostCliVersions)(),
+            providerClis: Object.fromEntries(shared_1.PROVIDER_CLI_NAMES.map((provider) => [provider, this.providerClis.getStatus(provider)])),
+            docker,
+            build: (0, build_info_1.readBuildInfo)(),
+            providerEnvOverrides,
             ...(runtimeToken ? { runtimeToken } : {}),
         };
     }
-    resolveDockerService() {
-        if (this.dockerService) {
-            return this.dockerService;
-        }
-        if (this.resolvedDockerService !== undefined) {
-            return this.resolvedDockerService;
-        }
-        if (!this.moduleRef) {
-            this.resolvedDockerService = null;
-            return this.resolvedDockerService;
-        }
-        try {
-            this.resolvedDockerService = this.moduleRef.get(docker_service_1.OrchestratorDockerService, {
-                strict: false,
-            });
-            return this.resolvedDockerService;
-        }
-        catch {
-            this.resolvedDockerService = null;
-            return this.resolvedDockerService;
-        }
-    }
-    async resolveDockerAvailability(mode) {
-        if (mode === 'normal') {
-            return false;
-        }
-        if (this.dockerAvailabilityCache !== null) {
-            return this.dockerAvailabilityCache;
-        }
-        if (this.dockerAvailabilityPending) {
-            return this.dockerAvailabilityPending;
-        }
-        this.dockerAvailabilityPending = (async () => {
-            const service = this.resolveDockerService();
-            if (!service) {
-                return false;
-            }
-            try {
-                return await service.ping();
-            }
-            catch {
-                return false;
-            }
-        })();
-        const availability = await this.dockerAvailabilityPending;
-        this.dockerAvailabilityCache = availability;
-        this.dockerAvailabilityPending = null;
-        return availability;
-    }
 };
 exports.RuntimeController = RuntimeController;
 __decorate([
     (0, common_1.Get)(),
-    (0, swagger_1.ApiOperation)({ summary: 'Get runtime mode and app version' }),
+    (0, swagger_1.ApiOperation)({ summary: 'Get app runtime metadata' }),
     (0, swagger_1.ApiResponse)({ status: 200, description: 'Runtime metadata' }),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
@@ -132,9 +78,8 @@ __decorate([
 exports.RuntimeController = RuntimeController = __decorate([
     (0, swagger_1.ApiTags)('runtime'),
     (0, common_1.Controller)('api/runtime'),
-    __param(0, (0, common_1.Optional)()),
-    __param(1, (0, common_1.Optional)()),
-    __metadata("design:paramtypes", [docker_service_1.OrchestratorDockerService,
-        core_1.ModuleRef])
+    __param(2, (0, common_1.Inject)(storage_interface_1.STORAGE_SERVICE)),
+    __metadata("design:paramtypes", [syncthing_manager_service_1.SyncthingManager,
+        provider_cli_install_state_service_1.ProviderCliInstallStateService, Object])
 ], RuntimeController);
 //# sourceMappingURL=runtime.controller.js.map

package/dist/server/modules/core/controllers/runtime.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.controller.js","sourceRoot":"","sources":["../../../../src/modules/core/controllers/runtime.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runtime.controller.js","sourceRoot":"","sources":["../../../../src/modules/core/controllers/runtime.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAsD;AACtD,oHAA6G;AAC7G,qDAAqD;AACrD,2CAAyD;AACzD,qCAAkC;AAClC,6CAAqE;AACrE,6DAA4D;AAC5D,wFAAuF;AACvF,kEAAiE;AACjE,uEAAmE;AACnE,kFAA6E;AAC7E,yFAA6E;AAC7E,0FAGqD;AACrD,6CAA6C;AAC7C,2DAA0D;AAInD,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAET;IACA;IAGyB;IAL5C,YACmB,SAA2B,EAC3B,YAA4C,EAGnB,OAAqC;QAJ9D,cAAS,GAAT,SAAS,CAAkB;QAC3B,iBAAY,GAAZ,YAAY,CAAgC;QAGnB,YAAO,GAAP,OAAO,CAA8B;IAC9E,CAAC;IAKE,AAAN,KAAK,CAAC,UAAU;QACd,MAAM,GAAG,GAAG,IAAA,yBAAY,GAAE,CAAC;QAC3B,MAAM,YAAY,GAChB,OAAO,GAAG,CAAC,aAAa,KAAK,QAAQ,IAAI,GAAG,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC;YAC1E,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,EAAE;YAC1B,CAAC,CAAC,SAAS,CAAC;QAEhB,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACvD,IAAA,kCAAiB,GAAE;YACnB,IAAA,oDAAyB,EAAC,IAAI,CAAC,OAAO,CAAC;SACxC,CAAC,CAAC;QAEH,OAAO;YACL,OAAO,EAAE,IAAA,2BAAa,GAAE;YAGxB,QAAQ,EAAE,IAAA,iBAAO,GAAE;YAKnB,GAAG,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,IAAI;YAC/B,GAAG,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,IAAI;YAC/B,MAAM,EAAE,kCAAe;YACvB,QAAQ,EAAE;gBACR,OAAO,EAAE,GAAG,CAAC,yBAAyB;aACvC;YACD,oBAAoB,EAAE,IAAA,+CAAuB,EAAC,GAAG,CAAC;YAClD,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE;YACnC,WAAW,EAAE,IAAA,uCAAmB,GAAE;YAClC,YAAY,EAAE,MAAM,CAAC,WAAW,CAC9B,2BAAkB,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CACxF;YACD,MAAM;YACN,KAAK,EAAE,IAAA,0BAAa,GAAE;YAGtB,oBAAoB;YACpB,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC1C,CAAC;IACJ,CAAC;CACF,CAAA;AArDY,8CAAiB;AAYtB;IAHL,IAAA,YAAG,GAAE;IACL,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,0BAA0B,EAAE,CAAC;IACrD,IAAA,qBAAW,EAAC,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC;;;;mDAyC7D;4BApDU,iBAAiB;IAF7B,IAAA,iBAAO,EAAC,SAAS,CAAC;IAClB,IAAA,mBAAU,EAAC,aAAa,CAAC;IAOrB,WAAA,IAAA,eAAM,EAAC,mCAAe,CAAC,CAAA;qCAJI,4CAAgB;QACb,mEAA8B;GAHpD,iBAAiB,CAqD7B"}

package/dist/server/modules/core/core-common.module.js

@@ -7,16 +7,21 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreCommonModule = void 0;
+const provider_cli_state_module_1 = require("../providers/services/provider-cli-state.module");
 const common_1 = require("@nestjs/common");
 const health_controller_1 = require("./controllers/health.controller");
 const runtime_controller_1 = require("./controllers/runtime.controller");
+const host_stats_controller_1 = require("./controllers/host-stats.controller");
 const health_service_1 = require("./services/health.service");
+const file_sync_module_1 = require("../file-sync/file-sync.module");
+const storage_module_1 = require("../storage/storage.module");
 let CoreCommonModule = class CoreCommonModule {
 };
 exports.CoreCommonModule = CoreCommonModule;
 exports.CoreCommonModule = CoreCommonModule = __decorate([
     (0, common_1.Module)({
-        controllers: [health_controller_1.HealthController, runtime_controller_1.RuntimeController],
+        imports: [file_sync_module_1.FileSyncModule, storage_module_1.StorageModule, provider_cli_state_module_1.ProviderCliStateModule],
+        controllers: [health_controller_1.HealthController, runtime_controller_1.RuntimeController, host_stats_controller_1.HostStatsController],
         providers: [health_service_1.HealthService],
         exports: [health_service_1.HealthService],
     })

package/dist/server/modules/core/core-common.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"core-common.module.js","sourceRoot":"","sources":["../../../src/modules/core/core-common.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,uEAAmE;AACnE,yEAAqE;AACrE,8DAA0D;AAOnD,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;CAAG,CAAA;AAAnB,4CAAgB;2BAAhB,gBAAgB;IAL5B,IAAA,eAAM,EAAC;QACN,WAAW,EAAE,CAAC,oCAAgB,EAAE,sCAAiB,CAAC;QAClD,SAAS,EAAE,CAAC,8BAAa,CAAC;QAC1B,OAAO,EAAE,CAAC,8BAAa,CAAC;KACzB,CAAC;GACW,gBAAgB,CAAG"}
+{"version":3,"file":"core-common.module.js","sourceRoot":"","sources":["../../../src/modules/core/core-common.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+FAAyF;AACzF,2CAAwC;AACxC,uEAAmE;AACnE,yEAAqE;AACrE,+EAA0E;AAC1E,8DAA0D;AAC1D,oEAA+D;AAC/D,8DAA0D;AAQnD,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;CAAG,CAAA;AAAnB,4CAAgB;2BAAhB,gBAAgB;IAN5B,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,iCAAc,EAAE,8BAAa,EAAE,kDAAsB,CAAC;QAChE,WAAW,EAAE,CAAC,oCAAgB,EAAE,sCAAiB,EAAE,2CAAmB,CAAC;QACvE,SAAS,EAAE,CAAC,8BAAa,CAAC;QAC1B,OAAO,EAAE,CAAC,8BAAa,CAAC;KACzB,CAAC;GACW,gBAAgB,CAAG"}

package/dist/server/modules/core/models/host-stats.model.d.ts

@@ -0,0 +1,12 @@
+export interface HostStats {
+    cpuPercent: number;
+    load1: number;
+    load5: number;
+    memTotalBytes: number;
+    memUsedBytes: number;
+    diskTotalBytes: number;
+    diskUsedBytes: number;
+    diskAvailBytes?: number;
+    uptimeSec: number;
+    sampledAt: string;
+}

package/dist/server/modules/{orchestrator/sync/dtos/overview.dto.js → core/models/host-stats.model.js}

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=overview.dto.js.map
+//# sourceMappingURL=host-stats.model.js.map

package/dist/server/modules/core/models/host-stats.model.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"host-stats.model.js","sourceRoot":"","sources":["../../../../src/modules/core/models/host-stats.model.ts"],"names":[],"mappings":""}

package/dist/server/modules/e2ee/services/device-revocation-history.d.ts

@@ -0,0 +1,5 @@
+import type Database from 'better-sqlite3';
+export declare const REVOKED_DEVICE_KIDS_KEY = "cloud.e2ee.revokedDeviceKids";
+export declare const MAX_REVOKED_DEVICE_KIDS = 1000;
+export declare function readRevokedDeviceKids(sqlite: Database.Database): string[];
+export declare function updateRevokedDeviceKids(sqlite: Database.Database, revoked: readonly string[], pairedKid?: string): void;

package/dist/server/modules/e2ee/services/device-revocation-history.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MAX_REVOKED_DEVICE_KIDS = exports.REVOKED_DEVICE_KIDS_KEY = void 0;
+exports.readRevokedDeviceKids = readRevokedDeviceKids;
+exports.updateRevokedDeviceKids = updateRevokedDeviceKids;
+const node_crypto_1 = require("node:crypto");
+exports.REVOKED_DEVICE_KIDS_KEY = 'cloud.e2ee.revokedDeviceKids';
+exports.MAX_REVOKED_DEVICE_KIDS = 1000;
+function readRevokedDeviceKids(sqlite) {
+    const row = sqlite
+        .prepare('SELECT value FROM settings WHERE key = ?')
+        .get(exports.REVOKED_DEVICE_KIDS_KEY);
+    if (!row)
+        return [];
+    const value = JSON.parse(row.value);
+    if (!Array.isArray(value) || !value.every((kid) => typeof kid === 'string' && kid.length > 0)) {
+        throw new Error('Invalid revoked-device history');
+    }
+    return value;
+}
+function updateRevokedDeviceKids(sqlite, revoked, pairedKid) {
+    const previous = readRevokedDeviceKids(sqlite);
+    const next = [
+        ...new Set([
+            ...previous.filter((kid) => kid !== pairedKid && !revoked.includes(kid)),
+            ...revoked,
+        ]),
+    ].slice(-exports.MAX_REVOKED_DEVICE_KIDS);
+    if (JSON.stringify(next) === JSON.stringify(previous))
+        return;
+    const now = new Date().toISOString();
+    sqlite
+        .prepare(`INSERT INTO settings (id, key, value, created_at, updated_at) VALUES (?, ?, ?, ?, ?)
+     ON CONFLICT(key) DO UPDATE SET value = excluded.value, updated_at = excluded.updated_at`)
+        .run((0, node_crypto_1.randomUUID)(), exports.REVOKED_DEVICE_KIDS_KEY, JSON.stringify(next), now, now);
+}
+//# sourceMappingURL=device-revocation-history.js.map

package/dist/server/modules/e2ee/services/device-revocation-history.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"device-revocation-history.js","sourceRoot":"","sources":["../../../../src/modules/e2ee/services/device-revocation-history.ts"],"names":[],"mappings":";;;AAOA,sDAUC;AAGD,0DAoBC;AAxCD,6CAAyC;AAG5B,QAAA,uBAAuB,GAAG,8BAA8B,CAAC;AACzD,QAAA,uBAAuB,GAAG,IAAI,CAAC;AAG5C,SAAgB,qBAAqB,CAAC,MAAyB;IAC7D,MAAM,GAAG,GAAG,MAAM;SACf,OAAO,CAAC,0CAA0C,CAAC;SACnD,GAAG,CAAC,+BAAuB,CAAkC,CAAC;IACjE,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,CAAC;IACpB,MAAM,KAAK,GAAY,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC7C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC;QAC9F,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAGD,SAAgB,uBAAuB,CACrC,MAAyB,EACzB,OAA0B,EAC1B,SAAkB;IAElB,MAAM,QAAQ,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAG;QACX,GAAG,IAAI,GAAG,CAAC;YACT,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,SAAS,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YACxE,GAAG,OAAO;SACX,CAAC;KACH,CAAC,KAAK,CAAC,CAAC,+BAAuB,CAAC,CAAC;IAClC,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;QAAE,OAAO;IAC9D,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACrC,MAAM;SACH,OAAO,CACN;6FACuF,CACxF;SACA,GAAG,CAAC,IAAA,wBAAU,GAAE,EAAE,+BAAuB,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAChF,CAAC"}

package/dist/server/modules/e2ee/services/e2ee-device-store.service.js

@@ -23,6 +23,7 @@ const sqlite_raw_1 = require("../../storage/db/sqlite-raw");
 const transaction_runner_1 = require("../../storage/db/transaction-runner");
 const logger_1 = require("../../../common/logging/logger");
 const paired_device_workspace_access_events_1 = require("../events/paired-device-workspace-access.events");
+const device_revocation_history_1 = require("./device-revocation-history");
 const logger = (0, logger_1.createLogger)('E2eeDeviceStore');
 const SETTINGS_KEY = 'cloud.e2ee.devices';
 const STORE_VERSION = 1;
@@ -65,12 +66,14 @@ let E2eeDeviceStoreService = class E2eeDeviceStoreService {
             if (existing?.notificationRoutingKid !== undefined) {
                 record.notificationRoutingKid = existing.notificationRoutingKid;
             }
-            if (!existing)
+            if (!existing && (0, device_revocation_history_1.readRevokedDeviceKids)(this.sqlite).includes(record.kid)) {
                 this.deleteWorkspaceGrants(record.kid);
+            }
             dir.devices[record.kid] = record;
             const evicted = this.supersedeByInstallId(dir.devices, record.installId, record.kid, opts.evictVerified ?? false);
             for (const kid of evicted)
                 this.deleteWorkspaceGrants(kid);
+            (0, device_revocation_history_1.updateRevokedDeviceKids)(this.sqlite, evicted, record.kid);
             this.save(dir);
             return evicted;
         });
@@ -89,12 +92,14 @@ let E2eeDeviceStoreService = class E2eeDeviceStoreService {
             const next = this.toDevice(reconciled);
             if (isCanonicalUuid(opts.installId))
                 next.installId = opts.installId;
-            if (!existing)
+            if (!existing && (0, device_revocation_history_1.readRevokedDeviceKids)(this.sqlite).includes(next.kid)) {
                 this.deleteWorkspaceGrants(next.kid);
+            }
             dir.devices[next.kid] = next;
             const evicted = this.supersedeByInstallId(dir.devices, next.installId, next.kid, opts.evictVerified ?? false);
             for (const kid of evicted)
                 this.deleteWorkspaceGrants(kid);
+            (0, device_revocation_history_1.updateRevokedDeviceKids)(this.sqlite, evicted, next.kid);
             this.save(dir);
             return { record: next, supersededKids: evicted };
         });
@@ -191,6 +196,7 @@ let E2eeDeviceStoreService = class E2eeDeviceStoreService {
                 return false;
             delete dir.devices[kid];
             this.deleteWorkspaceGrants(kid);
+            (0, device_revocation_history_1.updateRevokedDeviceKids)(this.sqlite, [kid]);
             this.save(dir);
             return true;
         });

package/dist/server/modules/e2ee/services/e2ee-device-store.service.js.map

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

package/dist/server/modules/epic-time/epic-time.module.js

@@ -18,12 +18,21 @@ const storage_module_1 = require("../storage/storage.module");
 const external_integrations_module_1 = require("../external-integrations/external-integrations.module");
 const epic_estimate_logging_service_1 = require("./services/epic-estimate-logging.service");
 const epic_time_store_module_1 = require("./epic-time-store.module");
+const project_write_admission_module_1 = require("../remotes/admission/project-write-admission.module");
+const remotes_module_1 = require("../remotes/remotes.module");
 let EpicTimeModule = class EpicTimeModule {
 };
 exports.EpicTimeModule = EpicTimeModule;
 exports.EpicTimeModule = EpicTimeModule = __decorate([
     (0, common_1.Module)({
-        imports: [epic_time_store_module_1.EpicTimeStoreModule, events_core_module_1.EventsCoreModule, storage_module_1.StorageModule, external_integrations_module_1.ExternalIntegrationsModule],
+        imports: [
+            epic_time_store_module_1.EpicTimeStoreModule,
+            events_core_module_1.EventsCoreModule,
+            storage_module_1.StorageModule,
+            external_integrations_module_1.ExternalIntegrationsModule,
+            project_write_admission_module_1.ProjectWriteAdmissionModule,
+            remotes_module_1.RemotesModule,
+        ],
         controllers: [epic_time_controller_1.EpicTimeController, agent_time_buffer_controller_1.AgentTimeBufferController, external_estimate_log_controller_1.ExternalEstimateLogController],
         providers: [agent_time_accounting_service_1.AgentTimeAccountingService, epic_time_service_1.EpicTimeService, epic_estimate_logging_service_1.EpicEstimateLoggingService],
         exports: [agent_time_accounting_service_1.AgentTimeAccountingService, epic_time_service_1.EpicTimeService, epic_estimate_logging_service_1.EpicEstimateLoggingService],