devchain-cli 0.24.1 → 0.25.0

package/dist/server/modules/remotes/host/host.controller.d.ts

@@ -1,19 +1,15 @@
-import type { ProjectReplicaChanges, ProjectReplicaImportResult, ProjectReplicaOfScope } from '@devchain/shared';
-import type { FrozenProject } from '../../storage/interfaces/storage.interface';
+import type { hostRoutes, HostHandlerResponse } from '../contract/host-routes';
 import { HostService } from './host.service';
-import type { ProjectTimeSettlement } from '../time/project-time-settler.service';
 export declare class HostController {
     private readonly host;
     constructor(host: HostService);
-    importProject(query: unknown, body: unknown): Promise<ProjectReplicaImportResult>;
-    exportReplica(id: string, query: unknown): Promise<ProjectReplicaOfScope<'attach' | 'detach'>>;
-    changes(id: string, query: unknown): Promise<ProjectReplicaChanges>;
-    freeze(id: string): Promise<FrozenProject>;
-    thaw(id: string): Promise<void>;
-    stopSessions(id: string): Promise<void>;
-    settleTime(id: string): Promise<ProjectTimeSettlement>;
-    release(id: string): Promise<void>;
-    findEpicByIdempotencyKey(id: string, key: string): Promise<{
-        epicId: string;
-    }>;
+    importProject(query: unknown, body: unknown): Promise<HostHandlerResponse<typeof hostRoutes.importProject, 201>>;
+    exportReplica(id: string, query: unknown): Promise<HostHandlerResponse<typeof hostRoutes.exportReplica, 200>>;
+    changes(id: string, query: unknown): Promise<HostHandlerResponse<typeof hostRoutes.changes, 200>>;
+    freeze(id: string): Promise<HostHandlerResponse<typeof hostRoutes.freeze, 200>>;
+    thaw(id: string): Promise<HostHandlerResponse<typeof hostRoutes.thaw, 204>>;
+    stopSessions(id: string): Promise<HostHandlerResponse<typeof hostRoutes.stopSessions, 204>>;
+    settleTime(id: string): Promise<HostHandlerResponse<typeof hostRoutes.settleTime, 200>>;
+    release(id: string): Promise<HostHandlerResponse<typeof hostRoutes.release, 204>>;
+    findEpicByIdempotencyKey(id: string, key: string): Promise<HostHandlerResponse<typeof hostRoutes.findEpicByIdempotencyKey, 200>>;
 }

package/dist/server/modules/remotes/host/host.controller.js.map

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

package/dist/server/modules/remotes/host/project-freeze.service.d.ts

@@ -1,10 +1,9 @@
-import { OnModuleInit } from '@nestjs/common';
 import { type FrozenProject, type ProjectHostStorage } from '../../storage/interfaces/storage.interface';
-export declare class ProjectFreezeService implements OnModuleInit {
+import { ProjectWriteGate } from '../../storage/write-gate/project-write-gate';
+export declare class ProjectFreezeService {
     private readonly storage;
-    private readonly frozen;
-    constructor(storage: ProjectHostStorage);
-    onModuleInit(): Promise<void>;
+    private readonly gate;
+    constructor(storage: ProjectHostStorage, gate: ProjectWriteGate);
     isFrozen(projectId: string): boolean;
     frozenProjectIds(): string[];
     assertWritable(projectId: string): void;

package/dist/server/modules/remotes/host/project-freeze.service.js

@@ -17,57 +17,51 @@ const common_1 = require("@nestjs/common");
 const error_types_1 = require("../../../common/errors/error-types");
 const logger_1 = require("../../../common/logging/logger");
 const storage_interface_1 = require("../../storage/interfaces/storage.interface");
+const project_write_gate_1 = require("../../storage/write-gate/project-write-gate");
 const logger = (0, logger_1.createLogger)('ProjectFreezeService');
 let ProjectFreezeService = class ProjectFreezeService {
     storage;
-    frozen = new Map();
-    constructor(storage) {
+    gate;
+    constructor(storage, gate) {
         this.storage = storage;
-    }
-    async onModuleInit() {
-        for (const { projectId, frozenAt } of await this.storage.listFrozenProjects()) {
-            this.frozen.set(projectId, frozenAt);
-        }
-        if (this.frozen.size > 0) {
-            logger.info({ projectIds: [...this.frozen.keys()] }, 'Restored frozen projects');
-        }
+        this.gate = gate;
     }
     isFrozen(projectId) {
-        return this.frozen.has(projectId);
+        return this.gate.isFrozen(projectId);
     }
     frozenProjectIds() {
-        return [...this.frozen.keys()];
+        return this.gate.frozenProjectIds();
     }
     assertWritable(projectId) {
-        if (this.frozen.has(projectId)) {
+        if (this.gate.isFrozen(projectId)) {
             throw new error_types_1.ProjectFrozenError(projectId);
         }
     }
     async freeze(projectId) {
-        const frozenAt = this.frozen.get(projectId) ?? new Date().toISOString();
+        const frozenAt = this.gate.getFrozenAt(projectId) ?? new Date().toISOString();
         await this.storage.setProjectFrozen(projectId, frozenAt);
-        this.frozen.set(projectId, frozenAt);
+        this.gate.markFrozen(projectId, frozenAt);
         logger.info({ projectId }, 'Project frozen');
         return { projectId, frozenAt };
     }
     hold(projectId, frozenAt) {
-        const current = this.frozen.get(projectId) ?? frozenAt;
-        this.frozen.set(projectId, current);
+        const current = this.gate.getFrozenAt(projectId) ?? frozenAt;
+        this.gate.markFrozen(projectId, current);
         return current;
     }
     async thaw(projectId) {
         await this.storage.setProjectFrozen(projectId, null);
-        this.frozen.delete(projectId);
+        this.gate.markThawed(projectId);
         logger.info({ projectId }, 'Project thawed');
     }
     forget(projectId) {
-        this.frozen.delete(projectId);
+        this.gate.markThawed(projectId);
     }
 };
 exports.ProjectFreezeService = ProjectFreezeService;
 exports.ProjectFreezeService = ProjectFreezeService = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, common_1.Inject)(storage_interface_1.STORAGE_SERVICE)),
-    __metadata("design:paramtypes", [Object])
+    __metadata("design:paramtypes", [Object, project_write_gate_1.ProjectWriteGate])
 ], ProjectFreezeService);
 //# sourceMappingURL=project-freeze.service.js.map

package/dist/server/modules/remotes/host/project-freeze.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"project-freeze.service.js","sourceRoot":"","sources":["../../../../src/modules/remotes/host/project-freeze.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAkE;AAClE,oEAAwE;AACxE,2DAA8D;AAC9D,kFAIoD;AAEpD,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,sBAAsB,CAAC,CAAC;AAQ7C,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAGuB;IAFrC,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEpD,YAAsD,OAA2B;QAA3B,YAAO,GAAP,OAAO,CAAoB;IAAG,CAAC;IAErF,KAAK,CAAC,YAAY;QAChB,KAAK,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC;YAC9E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACvC,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YACzB,MAAM,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,0BAA0B,CAAC,CAAC;QACnF,CAAC;IACH,CAAC;IAED,QAAQ,CAAC,SAAiB;QACxB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAED,gBAAgB;QACd,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IACjC,CAAC;IAGD,cAAc,CAAC,SAAiB;QAC9B,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,gCAAkB,CAAC,SAAS,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAGD,KAAK,CAAC,MAAM,CAAC,SAAiB;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACxE,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACzD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACrC,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,EAAE,gBAAgB,CAAC,CAAC;QAC7C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;IACjC,CAAC;IAMD,IAAI,CAAC,SAAiB,EAAE,QAAgB;QACtC,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAC;QACvD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACpC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,SAAiB;QAC1B,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QACrD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,EAAE,gBAAgB,CAAC,CAAC;IAC/C,CAAC;IAGD,MAAM,CAAC,SAAiB;QACtB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAChC,CAAC;CACF,CAAA;AA1DY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;IAIE,WAAA,IAAA,eAAM,EAAC,mCAAe,CAAC,CAAA;;GAHzB,oBAAoB,CA0DhC"}
+{"version":3,"file":"project-freeze.service.js","sourceRoot":"","sources":["../../../../src/modules/remotes/host/project-freeze.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,oEAAwE;AACxE,2DAA8D;AAC9D,kFAIoD;AACpD,oFAA+E;AAE/E,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,sBAAsB,CAAC,CAAC;AAQ7C,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAEa;IACzB;IAFnB,YAC4C,OAA2B,EACpD,IAAsB;QADG,YAAO,GAAP,OAAO,CAAoB;QACpD,SAAI,GAAJ,IAAI,CAAkB;IACtC,CAAC;IAEJ,QAAQ,CAAC,SAAiB;QACxB,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC;IAED,gBAAgB;QACd,OAAO,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;IACtC,CAAC;IAGD,cAAc,CAAC,SAAiB;QAC9B,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,gCAAkB,CAAC,SAAS,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAGD,KAAK,CAAC,MAAM,CAAC,SAAiB;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC9E,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACzD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAC1C,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,EAAE,gBAAgB,CAAC,CAAC;QAC7C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;IACjC,CAAC;IAMD,IAAI,CAAC,SAAiB,EAAE,QAAgB;QACtC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAC;QAC7D,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACzC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,SAAiB;QAC1B,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QACrD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAChC,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,EAAE,gBAAgB,CAAC,CAAC;IAC/C,CAAC;IAGD,MAAM,CAAC,SAAiB;QACtB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAClC,CAAC;CACF,CAAA;AAlDY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,eAAM,EAAC,mCAAe,CAAC,CAAA;6CACD,qCAAgB;GAH9B,oBAAoB,CAkDhC"}

package/dist/server/modules/remotes/host/provider-baseline.service.js

@@ -18,7 +18,7 @@ const node_os_1 = require("node:os");
 const node_path_1 = require("node:path");
 const provider_baseline_1 = require("../../../common/config/provider-baseline");
 const logger_1 = require("../../../common/logging/logger");
-const claude_config_1 = require("../../sessions/utils/claude-config");
+const claude_config_1 = require("../../providers/utils/claude-config");
 const host_helper_service_1 = require("./host-helper.service");
 const logger = (0, logger_1.createLogger)('ProviderBaselineService');
 const SETTINGS_FILE_MODE = 0o600;

package/dist/server/modules/remotes/host/provider-baseline.service.js.map

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

package/dist/server/modules/remotes/host-image.d.ts

@@ -1,3 +1,3 @@
-export declare const MIN_HOST_IMAGE_VERSION = "1.3.0";
+export declare const MIN_HOST_IMAGE_VERSION = "1.4.0";
 export declare function isSupportedHostImage(imageVersion: string | null | undefined): boolean;
 export declare function unsupportedHostImageMessage(imageVersion: string | null): string;

package/dist/server/modules/remotes/host-image.js

@@ -37,7 +37,7 @@ exports.MIN_HOST_IMAGE_VERSION = void 0;
 exports.isSupportedHostImage = isSupportedHostImage;
 exports.unsupportedHostImageMessage = unsupportedHostImageMessage;
 const semver = __importStar(require("semver"));
-exports.MIN_HOST_IMAGE_VERSION = '1.3.0';
+exports.MIN_HOST_IMAGE_VERSION = '1.4.0';
 function isSupportedHostImage(imageVersion) {
     return (Boolean(imageVersion) &&
         semver.valid(imageVersion) !== null &&

package/dist/server/modules/remotes/host-install/host-install-block.d.ts

@@ -12,6 +12,7 @@ export interface HostInstallPins {
         sha256: string;
     };
     aptPackages: string[];
+    toolPackages?: string[];
 }
 export interface HostInstallBlockOptions {
     pins: HostInstallPins;

package/dist/server/modules/remotes/host-install/host-install-block.js

@@ -51,6 +51,7 @@ function generateHostInstallBlock(options) {
         throw new Error('aptPackages must contain valid Debian package names');
     }
     const quotedAptPackages = aptPackages.map(shellQuote).join(' ');
+    const quotedToolPackages = (pins.toolPackages ?? []).map(shellQuote).join(' ');
     const invocation = options.checkOnly ? 'devchain_host_install --check' : 'devchain_host_install';
     return `# DevChain host installer. Run only on a dedicated LAN or VPN VM.
 DEVCHAIN_NODE_VERSION=${shellQuote(pins.nodeVersion)}
@@ -73,6 +74,7 @@ DEVCHAIN_BOOTSTRAP_PORT=${exports.HOST_INSTALL_BOOTSTRAP_PORT}
 DEVCHAIN_CERT_PATH=${shellQuote(exports.HOST_CERTIFICATE_PATH)}
 DEVCHAIN_FINGERPRINT_COMMAND=${shellQuote(exports.HOST_CERTIFICATE_FINGERPRINT_COMMAND)}
 DEVCHAIN_BASE_APT_PACKAGES=(${quotedAptPackages})
+DEVCHAIN_TOOL_APT_PACKAGES=(${quotedToolPackages})
 
 devchain_host_install() {
   (
@@ -349,6 +351,11 @@ devchain_host_install() {
     done
     if [[ -n "$output" ]]; then printf '%s\\n' "$output"; fi
   }
+  devchain_update_package_lists() {
+    if ! devchain_when_unlocked 'apt lists' apt-get -o DPkg::Lock::Timeout=600 update; then
+      devchain_warn 'apt-get update failed; continuing with the available package lists.'
+    fi
+  }
   devchain_when_unlocked dpkg dpkg --configure -a
 
   local guest_package=''
@@ -356,7 +363,7 @@ devchain_host_install() {
     kvm|qemu) guest_package=qemu-guest-agent ;;
     vmware) guest_package=open-vm-tools ;;
   esac
-  devchain_when_unlocked 'apt lists' apt-get -o DPkg::Lock::Timeout=600 update
+  devchain_update_package_lists
   local -a install_packages=("\${DEVCHAIN_BASE_APT_PACKAGES[@]}")
   if [[ -n "$guest_package" ]]; then install_packages+=("$guest_package"); fi
   apt-get -o DPkg::Lock::Timeout=600 install -y --no-install-recommends "\${install_packages[@]}"
@@ -385,9 +392,76 @@ devchain_host_install() {
   curl -fsSLo "$(devchain_path /etc/apt/keyrings/syncthing-archive-keyring.gpg)" https://syncthing.net/release-key.gpg
   printf '%s\\n' 'deb [signed-by=/etc/apt/keyrings/syncthing-archive-keyring.gpg] https://apt.syncthing.net/ syncthing stable-v2' \
     > "$(devchain_path /etc/apt/sources.list.d/syncthing.list)"
-  devchain_when_unlocked 'apt lists' apt-get -o DPkg::Lock::Timeout=600 update
+  devchain_update_package_lists
   apt-get -o DPkg::Lock::Timeout=600 install -y --no-install-recommends "syncthing=$DEVCHAIN_SYNCTHING_VERSION"
 
+  # Agent tools are best effort, so they come after every required apt step, and they only add
+  # packages: a failed upgrade of a package that installed packages depend on cannot be purged
+  # again. One budget covers every attempt; the env override keeps it testable in seconds
+  local -a tools_before=() missing_tools=()
+  local tool_package tool_changes=''
+  # usage: devchain_package_states; prints "<package> <status>" for every package that dpkg knows
+  devchain_package_states() {
+    dpkg-query -W -f='\${binary:Package} \${db:Status-Status}\\n' 2>/dev/null
+  }
+  mapfile -t tools_before < <(devchain_package_states | awk '$2 == "installed" { print $1 }')
+  for tool_package in "\${DEVCHAIN_TOOL_APT_PACKAGES[@]}"; do
+    [[ " \${tools_before[*]} " == *" $tool_package "* ]] || missing_tools+=("$tool_package")
+  done
+  if (( \${#missing_tools[@]} > 0 )); then
+    local tools_budget=600
+    if [[ "\${DEVCHAIN_TOOLS_TIMEOUT:-}" =~ ^[0-9]+$ ]]; then tools_budget="$DEVCHAIN_TOOLS_TIMEOUT"; fi
+    local tools_deadline=$((SECONDS + tools_budget))
+    # A failed or killed install can leave a package unconfigured, and apt then refuses every later
+    # install, so finish the interrupted work and purge the unconfigured packages the tools added
+    devchain_clean_tools() {
+      timeout --kill-after=5s 120s dpkg --configure -a >/dev/null 2>&1 || true
+      local -a broken=()
+      mapfile -t broken < <(devchain_package_states |
+        awk -v before=" \${tools_before[*]} " '$2 != "installed" && $2 != "not-installed" &&
+          $2 != "config-files" && index(before, " " $1 " ") == 0 { print $1 }')
+      if (( \${#broken[@]} > 0 )) &&
+        ! timeout --kill-after=5s 120s dpkg --purge --force-remove-reinstreq "\${broken[@]}"; then
+        devchain_warn "Could not remove the unconfigured packages \${broken[*]}; run dpkg --configure -a."
+      fi
+    }
+    # usage: devchain_tools_apt <seconds> <apt-get argument>...; the remaining budget caps the run
+    devchain_tools_apt() {
+      local limit="$1" remaining=$((tools_deadline - SECONDS))
+      shift
+      if (( remaining < limit )); then limit="$remaining"; fi
+      if (( limit <= 0 )); then return 124; fi
+      timeout --kill-after=5s "\${limit}s" apt-get "$@"
+    }
+    # usage: devchain_install_tools <seconds> <package>...; a dry run comes first, and an install
+    # that would change installed packages sets tool_changes
+    devchain_install_tools() {
+      local plan status=0
+      plan="$(devchain_tools_apt "$1" -s install -y --no-install-recommends --no-remove "\${@:2}" 2>&1)" ||
+        return "$?"
+      tool_changes="$(awk '$1 == "Inst" && $3 ~ /^\\[/ { printf "%s ", $2 }' <<< "$plan")"
+      if [[ -n "$tool_changes" ]]; then return 1; fi
+      devchain_tools_apt "$1" -o DPkg::Lock::Timeout=600 install -y --no-install-recommends \
+        --no-remove "\${@:2}" || status=$?
+      if (( status != 0 )); then devchain_clean_tools; fi
+      return "$status"
+    }
+    if ! devchain_install_tools 180 "\${missing_tools[@]}"; then
+      for tool_package in "\${missing_tools[@]}"; do
+        tool_changes=''
+        if (( SECONDS >= tools_deadline )); then
+          devchain_warn "Skipped agent tool $tool_package: the agent tools time budget ran out."
+        elif ! devchain_install_tools 120 "$tool_package"; then
+          if [[ -n "$tool_changes" ]]; then
+            devchain_warn "Skipped agent tool $tool_package: it would change the installed packages \${tool_changes% }."
+          else
+            devchain_warn "Skipped agent tool $tool_package: package installation failed."
+          fi
+        fi
+      done
+    fi
+  fi
+
   mkdir -p "$(devchain_path /etc/sysctl.d)"
   printf '%s' "$DEVCHAIN_SYSCTL_CONFIG" > "$(devchain_path /etc/sysctl.d/60-devchain-inotify.conf)"
   chmod 0644 "$(devchain_path /etc/sysctl.d/60-devchain-inotify.conf)"

package/dist/server/modules/remotes/host-install/host-install-block.js.map

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

package/dist/server/modules/remotes/host-install/host-install.service.d.ts

@@ -16,7 +16,6 @@ export interface HostInstallPaths {
 export declare const HOST_INSTALL_PATHS: unique symbol;
 export declare function findHostInstallDist(moduleDirectory: string): string | null;
 export declare function parseVersionsEnv(contents: string): Record<string, string>;
-export declare function parseAptPackages(contents: string): string[];
 export declare class HostInstallService {
     private readonly processExecutor;
     private sourceInputsPromise;

package/dist/server/modules/remotes/host-install/host-install.service.js

@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HostInstallService = exports.HOST_INSTALL_PATHS = void 0;
 exports.findHostInstallDist = findHostInstallDist;
 exports.parseVersionsEnv = parseVersionsEnv;
-exports.parseAptPackages = parseAptPackages;
 const common_1 = require("@nestjs/common");
 const node_crypto_1 = require("node:crypto");
 const node_fs_1 = require("node:fs");
@@ -83,34 +82,18 @@ function parseVersionsEnv(contents) {
             throw new Error(`Invalid host image version pin at line ${index + 1}`);
         values[match[1]] = match[2].trim().replace(/^("|')(.*)\1$/, '$2');
     }
-    for (const name of ['NODE_VERSION', 'SYNCTHING_VERSION', 'NPM_REGISTRY']) {
+    for (const name of [
+        'NODE_VERSION',
+        'SYNCTHING_VERSION',
+        'NPM_REGISTRY',
+        'DEVCHAIN_REQUIRED_PACKAGES',
+        'DEVCHAIN_TOOL_PACKAGES',
+    ]) {
         if (!values[name])
             throw new Error(`Host image version pin ${name} is missing`);
     }
     return values;
 }
-function parseAptPackages(contents) {
-    const lines = contents.split(/\r?\n/);
-    const first = lines.findIndex((line) => /^\s*apt-get\s+install\s+-y\s+--no-install-recommends(?:\s|\\|$)/.test(line));
-    if (first < 0)
-        throw new Error('Host image apt package list is missing');
-    const packages = [];
-    for (let index = first; index < lines.length; index += 1) {
-        let line = lines[index].replace(/\s+#.*$/, '').trim();
-        const continued = line.endsWith('\\');
-        if (continued)
-            line = line.slice(0, -1).trim();
-        if (index === first) {
-            line = line.replace(/^apt-get\s+install\s+-y\s+--no-install-recommends/, '').trim();
-        }
-        packages.push(...line.split(/\s+/).filter((name) => name && !name.startsWith('-')));
-        if (!continued)
-            break;
-    }
-    if (packages.length === 0)
-        throw new Error('Host image apt package list is empty');
-    return packages;
-}
 let HostInstallService = class HostInstallService {
     processExecutor;
     sourceInputsPromise = null;
@@ -202,7 +185,6 @@ let HostInstallService = class HostInstallService {
         }
         const archive = await (0, promises_1.readFile)((0, node_path_1.join)(this.paths.dataDirectory, filename));
         const versions = parseVersionsEnv(await (0, promises_1.readFile)((0, node_path_1.join)(repositoryRoot, 'apps/host-image/versions.env'), 'utf8'));
-        const aptPackages = parseAptPackages(await (0, promises_1.readFile)((0, node_path_1.join)(repositoryRoot, 'apps/host-image/customize.sh'), 'utf8'));
         const pins = {
             nodeVersion: versions.NODE_VERSION,
             syncthingVersion: versions.SYNCTHING_VERSION,
@@ -212,7 +194,8 @@ let HostInstallService = class HostInstallService {
                 version: packageJson.version,
                 sha256: (0, node_crypto_1.createHash)('sha256').update(archive).digest('hex'),
             },
-            aptPackages,
+            aptPackages: versions.DEVCHAIN_REQUIRED_PACKAGES.split(/\s+/),
+            toolPackages: versions.DEVCHAIN_TOOL_PACKAGES.split(/\s+/),
         };
         return {
             pins,

package/dist/server/modules/remotes/host-install/host-install.service.js.map

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

package/dist/server/modules/remotes/operations/attach.operation.d.ts

@@ -1,5 +1,6 @@
 import { TranscriptHandoff } from './transcript-handoff';
 import { DockerHandoff } from '../docker/docker-handoff';
+import { GitOwnerStore } from '../git-owner.store';
 import type { RemoteOperation } from '../../storage/models/domain.models';
 import { ProjectFreezeService } from '../host/project-freeze.service';
 import { type RemoteHealthPort } from '../ports/remote-health.port';
@@ -25,6 +26,8 @@ interface AttachDetails {
     managedExclusionsBefore?: string[];
     gitConfig?: 'sent' | 'not_set_on_pc' | 'failed';
     gitConfigError?: string;
+    vmGuardRemoved?: boolean;
+    vmGuardWarning?: string | null;
 }
 export declare class AttachOperation implements RemoteOperationDefinition {
     private readonly health;
@@ -40,10 +43,11 @@ export declare class AttachOperation implements RemoteOperationDefinition {
     private readonly transcripts;
     private readonly docker;
     private readonly processExecutor;
+    private readonly gitOwner;
     readonly kind: "attach";
     readonly steps: readonly RemoteOperationStepDefinition[];
     private readonly replicas;
-    constructor(health: RemoteHealthPort, bindings: RemoteBindingsService, builder: ProjectReplicaBuilder, host: RemoteHostClient, freeze: ProjectFreezeService, sessionsStopper: ProjectSessionsStopper, liveSync: RemoteLiveSyncService, timeSettler: ProjectTimeSettler, fileSync: FileSyncHandoff, managedExclusions: FileSyncManagedExclusionsStore, transcripts: TranscriptHandoff, docker: DockerHandoff, processExecutor: ProcessExecutor);
+    constructor(health: RemoteHealthPort, bindings: RemoteBindingsService, builder: ProjectReplicaBuilder, host: RemoteHostClient, freeze: ProjectFreezeService, sessionsStopper: ProjectSessionsStopper, liveSync: RemoteLiveSyncService, timeSettler: ProjectTimeSettler, fileSync: FileSyncHandoff, managedExclusions: FileSyncManagedExclusionsStore, transcripts: TranscriptHandoff, docker: DockerHandoff, processExecutor: ProcessExecutor, gitOwner: GitOwnerStore);
     forget(operationId: string): void;
     completed(operation: RemoteOperation): Promise<void>;
     interrupt(operationId: string): Promise<void>;

package/dist/server/modules/remotes/operations/attach.operation.js

@@ -16,7 +16,9 @@ exports.AttachOperation = void 0;
 const transcript_handoff_1 = require("./transcript-handoff");
 const docker_handoff_1 = require("../docker/docker-handoff");
 const common_1 = require("@nestjs/common");
+const node_os_1 = require("node:os");
 const home_identity_1 = require("../home-identity");
+const git_owner_store_1 = require("../git-owner.store");
 const error_types_1 = require("../../../common/errors/error-types");
 const logger_1 = require("../../../common/logging/logger");
 const project_freeze_service_1 = require("../host/project-freeze.service");
@@ -49,10 +51,11 @@ let AttachOperation = class AttachOperation {
     transcripts;
     docker;
     processExecutor;
+    gitOwner;
     kind = 'attach';
     steps;
     replicas = new Map();
-    constructor(health, bindings, builder, host, freeze, sessionsStopper, liveSync, timeSettler, fileSync, managedExclusions, transcripts, docker, processExecutor) {
+    constructor(health, bindings, builder, host, freeze, sessionsStopper, liveSync, timeSettler, fileSync, managedExclusions, transcripts, docker, processExecutor, gitOwner) {
         this.health = health;
         this.bindings = bindings;
         this.builder = builder;
@@ -66,6 +69,7 @@ let AttachOperation = class AttachOperation {
         this.transcripts = transcripts;
         this.docker = docker;
         this.processExecutor = processExecutor;
+        this.gitOwner = gitOwner;
         const noDocker = (details) => !(0, docker_handoff_1.dockerSelection)(details);
         this.steps = [
             { id: 'preflight', label: 'Check the VM and the project', run: (c) => this.preflight(c) },
@@ -166,9 +170,24 @@ let AttachOperation = class AttachOperation {
             logger.warn({ operationId: operation.id }, 'Docker cancel cleanup failed');
             return { dockerCleanupError: error instanceof Error ? error.message : String(error) };
         });
-        const folderError = (0, remote_operation_types_1.stepStarted)(operation, 'file_sync_initial')
+        const initialStarted = (0, remote_operation_types_1.stepStarted)(operation, 'file_sync_initial');
+        const folderError = initialStarted
             ? await this.fileSync.removeFolders(operation.remoteId, projectId)
             : null;
+        let vmGuardWarning = null;
+        if (initialStarted || details.vmGuardRemoved) {
+            try {
+                const result = await this.host.installGitGuard(operation.remoteId, projectId, {
+                    homeName: (0, node_os_1.hostname)(),
+                    reason: 'cancelled-connect',
+                });
+                vmGuardWarning = result.warning;
+            }
+            catch (error) {
+                vmGuardWarning = `VM git guard could not be restored after the cancelled Connect: ${error instanceof Error ? error.message : String(error)}`;
+                logger.warn({ operationId: operation.id, projectId }, 'VM git guard was not restored');
+            }
+        }
         if (details.managedExclusionsBefore)
             this.managedExclusions.set(projectId, details.managedExclusionsBefore);
         let releaseError = null;
@@ -200,9 +219,10 @@ let AttachOperation = class AttachOperation {
             ...docker,
             ...(releaseError && { hostReleaseError: releaseError }),
             ...(folderError && { hostFolderRemovalError: folderError }),
+            ...(vmGuardWarning && { vmGuardWarning }),
         };
     }
-    async preflight({ operation, details }) {
+    async preflight({ operation, details, progress }) {
         const projectId = (0, remote_operation_types_1.requireProjectId)(operation);
         const { remoteId } = operation;
         const health = this.health.getState(remoteId);
@@ -228,12 +248,25 @@ let AttachOperation = class AttachOperation {
         if (existing && !ours && existing.state !== 'failed') {
             throw new remote_operation_errors_1.RemoteOperationStepRefusedError('REMOTE_BINDING_EXISTS', 'The project is already connected to a remote.', { projectId, remoteId: existing.remoteId, state: existing.state });
         }
+        if (await this.fileSync.ensureRepository(projectId)) {
+            await progress({ gitInit: 'created' }, { durable: true });
+        }
         const build = await this.builder.build({ projectIds: [projectId], scope: 'attach' });
         if (!build.ok) {
             throw new error_types_1.ReplicaPreflightError(build.errors);
         }
         if (!ours && (await this.host.projectExists(remoteId, projectId))) {
-            throw new remote_operation_errors_1.RemoteOperationStepRefusedError('HOST_PROJECT_EXISTS', 'The remote already has a project with this ID.', { projectId, remoteId });
+            if (existing?.state !== 'failed' || existing.remoteId !== remoteId) {
+                throw new remote_operation_errors_1.RemoteOperationStepRefusedError('HOST_PROJECT_EXISTS', 'The remote already has a project with this ID.', { projectId, remoteId });
+            }
+            try {
+                await this.host.freeze(remoteId, projectId);
+                await this.host.release(remoteId, projectId);
+            }
+            catch (error) {
+                throw new remote_operation_errors_1.RemoteOperationStepRefusedError('HOST_PROJECT_EXISTS', 'The remote still has the copy from the cancelled connect, and removing it failed: ' +
+                    (error instanceof Error ? error.message : String(error)), { projectId, remoteId });
+            }
         }
         if (existing?.state === 'failed') {
             await this.bindings.delete(projectId);
@@ -291,6 +324,7 @@ let AttachOperation = class AttachOperation {
             state: 'remote',
             hostCursor: cursor,
         });
+        this.gitOwner.clear((0, remote_operation_types_1.requireProjectId)(operation));
     }
     async thawHost({ operation }) {
         await this.host.thaw(operation.remoteId, (0, remote_operation_types_1.requireProjectId)(operation));
@@ -324,6 +358,7 @@ exports.AttachOperation = AttachOperation = __decorate([
         file_sync_managed_exclusions_store_1.FileSyncManagedExclusionsStore,
         transcript_handoff_1.TranscriptHandoff,
         docker_handoff_1.DockerHandoff,
-        process_executor_port_1.ProcessExecutor])
+        process_executor_port_1.ProcessExecutor,
+        git_owner_store_1.GitOwnerStore])
 ], AttachOperation);
 //# sourceMappingURL=attach.operation.js.map