devchain-cli 0.16.1 → 0.17.0

package/dist/server/modules/orchestrator/worktrees/runtime/container-runtime.js

@@ -0,0 +1,58 @@
+"use strict";
+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 __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.ContainerRuntime = void 0;
+const common_1 = require("@nestjs/common");
+const docker_service_1 = require("../../docker/services/docker.service");
+let ContainerRuntime = class ContainerRuntime {
+    constructor(docker) {
+        this.docker = docker;
+    }
+    createContainer(config) {
+        return this.docker.createContainer(config);
+    }
+    startContainer(containerId) {
+        return this.docker.startContainer(containerId);
+    }
+    stopContainer(containerId) {
+        return this.docker.stopContainer(containerId);
+    }
+    removeContainer(containerId, force) {
+        return this.docker.removeContainer(containerId, force);
+    }
+    waitForHealthy(containerId, timeoutMs) {
+        return this.docker.waitForHealthy(containerId, timeoutMs);
+    }
+    getContainerHostPort(containerId) {
+        return this.docker.getContainerHostPort(containerId);
+    }
+    getContainerLogs(containerId, tail) {
+        return this.docker.getContainerLogs(containerId, tail);
+    }
+    ensureWorktreeOnComposeNetwork(worktreeName, containerId) {
+        return this.docker.ensureWorktreeOnComposeNetwork(worktreeName, containerId);
+    }
+    removeWorktreeNetwork(worktreeName) {
+        return this.docker.removeWorktreeNetwork(worktreeName);
+    }
+    cleanupWorktreeProjectContainers(worktreeName, containerId) {
+        return this.docker.cleanupWorktreeProjectContainers(worktreeName, containerId);
+    }
+    subscribeToContainerEvents(onEvent) {
+        return this.docker.subscribeToContainerEvents(onEvent);
+    }
+};
+exports.ContainerRuntime = ContainerRuntime;
+exports.ContainerRuntime = ContainerRuntime = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [docker_service_1.OrchestratorDockerService])
+], ContainerRuntime);
+//# sourceMappingURL=container-runtime.js.map

package/dist/server/modules/orchestrator/worktrees/runtime/container-runtime.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"container-runtime.js","sourceRoot":"","sources":["../../../../../src/modules/orchestrator/worktrees/runtime/container-runtime.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAAiF;AAkB1E,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YAA6B,MAAiC;QAAjC,WAAM,GAAN,MAAM,CAA2B;IAAG,CAAC;IAElE,eAAe,CAAC,MAA6B;QAC3C,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAC7C,CAAC;IAED,cAAc,CAAC,WAAmB;QAChC,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IACjD,CAAC;IAED,aAAa,CAAC,WAAmB;QAC/B,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAChD,CAAC;IAED,eAAe,CAAC,WAAmB,EAAE,KAAe;QAClD,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IACzD,CAAC;IAED,cAAc,CAAC,WAAmB,EAAE,SAAiB;QACnD,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IAC5D,CAAC;IAED,oBAAoB,CAAC,WAAmB;QACtC,OAAO,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;IACvD,CAAC;IAED,gBAAgB,CAAC,WAAmB,EAAE,IAAY;QAChD,OAAO,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IACzD,CAAC;IAED,8BAA8B,CAAC,YAAoB,EAAE,WAAmB;QACtE,OAAO,IAAI,CAAC,MAAM,CAAC,8BAA8B,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IAC/E,CAAC;IAED,qBAAqB,CAAC,YAAoB;QACxC,OAAO,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,YAAY,CAAC,CAAC;IACzD,CAAC;IAED,gCAAgC,CAC9B,YAAoB,EACpB,WAA2B;QAE3B,OAAO,IAAI,CAAC,MAAM,CAAC,gCAAgC,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IACjF,CAAC;IAED,0BAA0B,CAAC,OAA8C;QACvE,OAAO,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC;IACzD,CAAC;CACF,CAAA;AAjDY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;qCAE0B,0CAAyB;GADnD,gBAAgB,CAiD5B"}

package/dist/server/modules/orchestrator/worktrees/runtime/process-runtime.d.ts

@@ -0,0 +1,38 @@
+import { ProcessExecutor } from '../../../terminal/services/process-executor/process-executor.port';
+export interface StartedProcessRuntime {
+    processId: number;
+    hostPort: number;
+    runtimeToken: string;
+    startedAt: Date;
+}
+export interface RuntimeMetadataResponse {
+    runtimeToken?: string;
+}
+export type ProcessHealthVerdict = 'dead' | 'unreachable' | 'token-mismatch' | 'healthy';
+export declare class ProcessRuntime {
+    private readonly executor;
+    constructor(executor: ProcessExecutor);
+    startProcessRuntime(input: {
+        worktreePath: string;
+        dataPath: string;
+        projectId: string;
+    }): Promise<StartedProcessRuntime>;
+    probeHealth(input: {
+        pid: number | null;
+        hostPort: number | null;
+        runtimeToken: string | null;
+    }): Promise<ProcessHealthVerdict>;
+    readLogs(dataPath: string, tail: number): Promise<string>;
+    readRecentLog(dataPath: string, maxChars?: number): Promise<string>;
+    private spawnProcessRuntime;
+    private waitForRuntimeHealthy;
+    private waitForRuntimePortFile;
+    checkRuntimeReady(hostPort: number): Promise<boolean>;
+    fetchRuntimeMetadata(hostPort: number): Promise<RuntimeMetadataResponse | null>;
+    private resolveCliPath;
+    private resolveProcessLogPath;
+    terminateProcess(pid?: number | null): Promise<void>;
+    private signalProcessAndAwaitExit;
+    isProcessAlive(pid: number): boolean;
+    private sleep;
+}

package/dist/server/modules/orchestrator/worktrees/runtime/process-runtime.js

@@ -0,0 +1,295 @@
+"use strict";
+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 __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.ProcessRuntime = void 0;
+const common_1 = require("@nestjs/common");
+const crypto_1 = require("crypto");
+const fs_1 = require("fs");
+const promises_1 = require("fs/promises");
+const path_1 = require("path");
+const logger_1 = require("../../../../common/logging/logger");
+const process_executor_port_1 = require("../../../terminal/services/process-executor/process-executor.port");
+const logger = (0, logger_1.createLogger)('WorktreeProcessRuntime');
+const PROCESS_READINESS_TIMEOUT_MS = 60_000;
+const PROCESS_SHUTDOWN_TIMEOUT_MS = 30_000;
+const PROCESS_KILL_TIMEOUT_MS = 5_000;
+const PROCESS_LOG_FILE_NAME = 'devchain.log';
+const PROCESS_DB_FILE_NAME = 'devchain.db';
+const PROCESS_RUNTIME_PORT_FILE = 'runtime-port.json';
+const PROCESS_HEALTH_POLL_INTERVAL_MS = 1_000;
+const PROCESS_RUNTIME_TIMEOUT_MS = 1_500;
+let ProcessRuntime = class ProcessRuntime {
+    constructor(executor) {
+        this.executor = executor;
+    }
+    async startProcessRuntime(input) {
+        const runtimeToken = (0, crypto_1.randomUUID)();
+        const portFilePath = (0, path_1.join)(input.dataPath, PROCESS_RUNTIME_PORT_FILE);
+        await (0, promises_1.rm)(portFilePath, { force: true }).catch(() => undefined);
+        const processId = await this.spawnProcessRuntime({
+            worktreePath: input.worktreePath,
+            dataPath: input.dataPath,
+            projectId: input.projectId,
+            runtimeToken,
+        });
+        const portInfo = await this.waitForRuntimePortFile(portFilePath, PROCESS_READINESS_TIMEOUT_MS, processId);
+        if (!portInfo) {
+            await this.terminateProcess(processId).catch(() => undefined);
+            throw new Error('Process runtime did not report its port before timeout');
+        }
+        if (portInfo.runtimeToken !== runtimeToken) {
+            await this.terminateProcess(processId).catch(() => undefined);
+            throw new Error(`Runtime port file token mismatch: expected ${runtimeToken}, ` +
+                `got ${portInfo.runtimeToken ?? 'none'}`);
+        }
+        const hostPort = portInfo.port;
+        const healthy = await this.waitForRuntimeHealthy(hostPort, PROCESS_READINESS_TIMEOUT_MS, processId);
+        if (!healthy) {
+            await this.terminateProcess(processId).catch(() => undefined);
+            throw new Error('Process runtime did not become healthy before timeout');
+        }
+        return { processId, hostPort, runtimeToken, startedAt: new Date() };
+    }
+    async probeHealth(input) {
+        const { pid, hostPort, runtimeToken } = input;
+        if (!pid || !this.isProcessAlive(pid)) {
+            return 'dead';
+        }
+        if (!hostPort || !runtimeToken) {
+            return 'unreachable';
+        }
+        const ready = await this.checkRuntimeReady(hostPort);
+        if (!ready) {
+            return 'unreachable';
+        }
+        const metadata = await this.fetchRuntimeMetadata(hostPort);
+        if (metadata?.runtimeToken !== runtimeToken) {
+            return 'token-mismatch';
+        }
+        return 'healthy';
+    }
+    async readLogs(dataPath, tail) {
+        const logPath = this.resolveProcessLogPath(dataPath);
+        const content = await (0, promises_1.readFile)(logPath, 'utf8').catch((error) => {
+            if (error?.code === 'ENOENT') {
+                return '';
+            }
+            throw error;
+        });
+        const lines = content.split(/\r?\n/).filter((line, index, all) => {
+            if (line.length > 0) {
+                return true;
+            }
+            return index < all.length - 1;
+        });
+        const tailed = lines.slice(-tail).join('\n');
+        return tailed ? `${tailed}\n` : '';
+    }
+    async readRecentLog(dataPath, maxChars = 2000) {
+        const logPath = this.resolveProcessLogPath(dataPath);
+        try {
+            const content = await (0, promises_1.readFile)(logPath, 'utf-8');
+            return content.trim() ? content.slice(-maxChars) : '';
+        }
+        catch {
+            return '';
+        }
+    }
+    async spawnProcessRuntime(input) {
+        const cliPath = this.resolveCliPath();
+        const logPath = this.resolveProcessLogPath(input.dataPath);
+        const portFilePath = (0, path_1.join)(input.dataPath, PROCESS_RUNTIME_PORT_FILE);
+        await (0, promises_1.mkdir)(input.dataPath, { recursive: true });
+        const result = await this.executor.spawnDaemon({
+            argv: [
+                process.execPath,
+                cliPath,
+                'start',
+                '--foreground',
+                '--worktree-runtime',
+                'process',
+                '--port',
+                '0',
+            ],
+            cwd: input.worktreePath,
+            logPath,
+            env: {
+                ...process.env,
+                PORT: '0',
+                HOST: '127.0.0.1',
+                NODE_ENV: 'production',
+                DB_PATH: input.dataPath,
+                DB_FILENAME: PROCESS_DB_FILE_NAME,
+                DEVCHAIN_MODE: 'normal',
+                CONTAINER_PROJECT_ID: input.projectId,
+                RUNTIME_TOKEN: input.runtimeToken,
+                RUNTIME_PORT_FILE: portFilePath,
+            },
+        });
+        return result.pid;
+    }
+    async waitForRuntimeHealthy(hostPort, timeoutMs, pid) {
+        if (timeoutMs <= 0) {
+            return false;
+        }
+        const deadline = Date.now() + timeoutMs;
+        while (Date.now() < deadline) {
+            if (pid && !this.isProcessAlive(pid)) {
+                logger.warn({ pid, hostPort }, 'Child process exited during health polling');
+                return false;
+            }
+            const isReady = await this.checkRuntimeReady(hostPort);
+            if (isReady) {
+                return true;
+            }
+            await this.sleep(PROCESS_HEALTH_POLL_INTERVAL_MS);
+        }
+        return false;
+    }
+    async waitForRuntimePortFile(filePath, timeoutMs, pid) {
+        if (timeoutMs <= 0) {
+            return null;
+        }
+        const deadline = Date.now() + timeoutMs;
+        while (Date.now() < deadline) {
+            if (pid && !this.isProcessAlive(pid)) {
+                logger.warn({ pid, filePath }, 'Child process exited before writing port file');
+                return null;
+            }
+            try {
+                const raw = await (0, promises_1.readFile)(filePath, 'utf-8');
+                const parsed = JSON.parse(raw);
+                if (typeof parsed.port === 'number' && parsed.port > 0) {
+                    return { port: parsed.port, runtimeToken: parsed.runtimeToken ?? null };
+                }
+            }
+            catch {
+            }
+            await this.sleep(PROCESS_HEALTH_POLL_INTERVAL_MS);
+        }
+        return null;
+    }
+    async checkRuntimeReady(hostPort) {
+        const controller = new AbortController();
+        const timeout = setTimeout(() => controller.abort(), PROCESS_RUNTIME_TIMEOUT_MS);
+        try {
+            const response = await fetch(`http://127.0.0.1:${hostPort}/health/ready`, {
+                signal: controller.signal,
+            });
+            return response.ok;
+        }
+        catch {
+            return false;
+        }
+        finally {
+            clearTimeout(timeout);
+        }
+    }
+    async fetchRuntimeMetadata(hostPort) {
+        const controller = new AbortController();
+        const timeout = setTimeout(() => controller.abort(), PROCESS_RUNTIME_TIMEOUT_MS);
+        try {
+            const response = await fetch(`http://127.0.0.1:${hostPort}/api/runtime`, {
+                headers: { accept: 'application/json' },
+                signal: controller.signal,
+            });
+            if (!response.ok) {
+                return null;
+            }
+            return (await response.json());
+        }
+        catch {
+            return null;
+        }
+        finally {
+            clearTimeout(timeout);
+        }
+    }
+    resolveCliPath() {
+        const candidates = [
+            (0, path_1.resolve)(process.cwd(), 'scripts', 'cli.js'),
+            (0, path_1.resolve)(__dirname, '../../../../../../../../scripts/cli.js'),
+            (0, path_1.resolve)(__dirname, '../../../../../../../scripts/cli.js'),
+            (0, path_1.resolve)(__dirname, '../../../../../cli.js'),
+        ];
+        if (process.argv[1] && !candidates.includes((0, path_1.resolve)(process.argv[1]))) {
+            candidates.push((0, path_1.resolve)(process.argv[1]));
+        }
+        for (const candidate of candidates) {
+            if ((0, fs_1.existsSync)(candidate)) {
+                return candidate;
+            }
+        }
+        throw new Error('Unable to locate CLI entry point for process runtime start. ' +
+            `Searched: ${candidates.join(', ')}`);
+    }
+    resolveProcessLogPath(dataPath) {
+        return (0, path_1.join)(dataPath, PROCESS_LOG_FILE_NAME);
+    }
+    async terminateProcess(pid) {
+        if (!pid) {
+            return;
+        }
+        const stillRunningAfterSigterm = await this.signalProcessAndAwaitExit(pid, 'SIGTERM', PROCESS_SHUTDOWN_TIMEOUT_MS);
+        if (!stillRunningAfterSigterm) {
+            return;
+        }
+        await this.signalProcessAndAwaitExit(pid, 'SIGKILL', PROCESS_KILL_TIMEOUT_MS).catch((error) => {
+            logger.warn({ error, pid }, 'Failed sending SIGKILL to worktree process');
+        });
+    }
+    async signalProcessAndAwaitExit(pid, signal, timeoutMs) {
+        const signalPid = process.platform === 'win32' ? pid : -pid;
+        try {
+            process.kill(signalPid, signal);
+        }
+        catch (error) {
+            const code = error.code;
+            if (code === 'ESRCH') {
+                return false;
+            }
+            throw error;
+        }
+        const deadline = Date.now() + timeoutMs;
+        while (Date.now() < deadline) {
+            if (!this.isProcessAlive(pid)) {
+                return false;
+            }
+            await this.sleep(200);
+        }
+        return this.isProcessAlive(pid);
+    }
+    isProcessAlive(pid) {
+        try {
+            process.kill(pid, 0);
+            return true;
+        }
+        catch (error) {
+            const code = error.code;
+            if (code === 'ESRCH') {
+                return false;
+            }
+            if (code === 'EPERM') {
+                return true;
+            }
+            return false;
+        }
+    }
+    async sleep(ms) {
+        await new Promise((resolvePromise) => setTimeout(resolvePromise, ms));
+    }
+};
+exports.ProcessRuntime = ProcessRuntime;
+exports.ProcessRuntime = ProcessRuntime = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [process_executor_port_1.ProcessExecutor])
+], ProcessRuntime);
+//# sourceMappingURL=process-runtime.js.map

package/dist/server/modules/orchestrator/worktrees/runtime/process-runtime.js.map

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

package/dist/server/modules/orchestrator/worktrees/runtime/worktree-runtime.d.ts

@@ -0,0 +1,15 @@
+import type { CreateContainerConfig, ContainerInfo, DockerContainerEvent } from '../../docker/services/docker.service';
+export type { CreateContainerConfig, ContainerInfo, DockerContainerEvent };
+export interface WorktreeRuntime {
+    createContainer(config: CreateContainerConfig): Promise<ContainerInfo>;
+    startContainer(containerId: string): Promise<void>;
+    stopContainer(containerId: string): Promise<void>;
+    removeContainer(containerId: string, force?: boolean): Promise<void>;
+    waitForHealthy(containerId: string, timeoutMs: number): Promise<boolean>;
+    getContainerHostPort(containerId: string): Promise<number | null>;
+    getContainerLogs(containerId: string, tail: number): Promise<string>;
+    ensureWorktreeOnComposeNetwork(worktreeName: string, containerId: string): Promise<void>;
+    removeWorktreeNetwork(worktreeName: string): Promise<void>;
+    cleanupWorktreeProjectContainers(worktreeName: string, containerId?: string | null): Promise<void>;
+    subscribeToContainerEvents(onEvent: (event: DockerContainerEvent) => void): Promise<() => void>;
+}

package/dist/server/modules/orchestrator/worktrees/runtime/worktree-runtime.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=worktree-runtime.js.map

package/dist/server/modules/orchestrator/worktrees/runtime/worktree-runtime.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-runtime.js","sourceRoot":"","sources":["../../../../../src/modules/orchestrator/worktrees/runtime/worktree-runtime.ts"],"names":[],"mappings":""}

package/dist/server/modules/orchestrator/worktrees/services/worktrees.service.d.ts

@@ -4,23 +4,24 @@ import { EventLogService } from '../../../events/services/event-log.service';
 import { CreateWorktreeDto, WorktreeMergePreviewDto, WorktreeLogsQueryDto, WorktreeOverviewDto, WorktreeResponseDto } from '../dtos/worktree.dto';
 import { WorktreesStore } from '../worktrees.store';
 import { GitWorktreeService } from '../../git/services/git-worktree.service';
-import { OrchestratorDockerService } from '../../docker/services/docker.service';
 import { SeedPreparationService } from '../../docker/services/seed-preparation.service';
+import { ContainerRuntime } from '../runtime/container-runtime';
+import { ProcessRuntime } from '../runtime/process-runtime';
 import { type StorageService } from '../../../storage/interfaces/storage.interface';
-import { ProcessExecutor } from '../../../terminal/services/process-executor/process-executor.port';
 export declare class WorktreesService implements OnModuleInit, OnModuleDestroy {
     private readonly store;
-    private readonly dockerService;
+    private readonly containerRuntime;
+    private readonly processRuntime;
     private readonly gitService;
     private readonly seedPreparationService;
     private readonly eventEmitter;
     private readonly eventLogService;
     private readonly storage?;
-    private readonly executor?;
     private monitorTimer?;
     private unsubscribeDockerEvents?;
     private readonly consecutiveHealthFailures;
-    constructor(store: WorktreesStore, dockerService: OrchestratorDockerService, gitService: GitWorktreeService, seedPreparationService: SeedPreparationService, eventEmitter: EventEmitter2, eventLogService: EventLogService, storage?: StorageService | undefined, executor?: ProcessExecutor | undefined);
+    private readonly inFlightOperations;
+    constructor(store: WorktreesStore, containerRuntime: ContainerRuntime, processRuntime: ProcessRuntime, gitService: GitWorktreeService, seedPreparationService: SeedPreparationService, eventEmitter: EventEmitter2, eventLogService: EventLogService, storage?: StorageService | undefined);
     onModuleInit(): Promise<void>;
     onModuleDestroy(): void;
     createWorktree(input: CreateWorktreeDto): Promise<WorktreeResponseDto>;
@@ -34,11 +35,16 @@ export declare class WorktreesService implements OnModuleInit, OnModuleDestroy {
     }): Promise<{
         success: true;
     }>;
+    private executeDelete;
     startWorktree(id: string): Promise<WorktreeResponseDto>;
+    private executeStart;
     stopWorktree(id: string): Promise<WorktreeResponseDto>;
+    private executeStop;
     previewMergeWorktree(id: string): Promise<WorktreeMergePreviewDto>;
     mergeWorktree(id: string): Promise<WorktreeResponseDto>;
+    private executeMerge;
     rebaseWorktree(id: string): Promise<WorktreeResponseDto>;
+    private executeRebase;
     private extractTasksForMergedHistory;
     private emitTaskMergeRequested;
     private ensureContainerReadyForTaskExtraction;
@@ -57,20 +63,9 @@ export declare class WorktreesService implements OnModuleInit, OnModuleDestroy {
     private handleProcessProbeFailure;
     private reconcileProcessOrphans;
     private resolveRuntimeType;
-    private startProcessRuntime;
-    private spawnProcessRuntime;
-    private waitForRuntimeHealthy;
-    private waitForRuntimePortFile;
-    private checkRuntimeReady;
-    private fetchRuntimeMetadata;
-    private resolveCliPath;
-    private resolveProcessLogPath;
-    private terminateProcess;
-    private signalProcessAndAwaitExit;
-    private isProcessAlive;
-    private sleep;
     private handleContainerEvent;
     private requireWorktree;
+    private withOperationGuard;
     private registerProjectInContainer;
     private ensureTemplateExists;
     private resolveRepoPath;