devchain-cli 0.20.3 → 0.22.0

package/dist/server/modules/sessions/services/provider-runtime-preparation/provider-runtime-preparation.service.js

@@ -0,0 +1,297 @@
+"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);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProviderRuntimePreparationService = void 0;
+const common_1 = require("@nestjs/common");
+const crypto_1 = require("crypto");
+const shared_1 = require("@devchain/shared");
+const env_config_1 = require("../../../../common/config/env.config");
+const error_types_1 = require("../../../../common/errors/error-types");
+const capabilities_1 = require("../../../providers/adapters/capabilities");
+const provider_plugin_policy_service_1 = require("../../../providers/services/provider-plugin-policy.service");
+const claude_launch_settings_materializer_service_1 = require("../../../runtime-context-capture/claude-launch-settings-materializer.service");
+const context_window_policy_1 = require("../../../runtime-context-capture/context-window-policy");
+const codex_plugin_profile_materializer_service_1 = require("../../../runtime-context-capture/codex-plugin-profile-materializer.service");
+const runtime_context_capture_service_1 = require("../../../runtime-context-capture/runtime-context-capture.service");
+const storage_interface_1 = require("../../../storage/interfaces/storage.interface");
+const env_builder_1 = require("../../utils/env-builder");
+const profile_options_1 = require("../../utils/profile-options");
+const provider_launch_config_1 = require("../provider-launch-config");
+const provider_runtime_preparation_types_1 = require("./provider-runtime-preparation.types");
+const NOOP_AFTER_COMMAND = async () => undefined;
+class ProviderRuntimePlanValue extends provider_runtime_preparation_types_1.ProviderRuntimePlan {
+    state;
+    constructor(state) {
+        super();
+        this.state = state;
+        Object.freeze(this);
+    }
+}
+let ProviderRuntimePreparationService = class ProviderRuntimePreparationService {
+    storage;
+    providerPluginPolicy;
+    runtimeContextCapture;
+    claudeLaunchSettings;
+    codexPluginProfiles;
+    constructor(storage, providerPluginPolicy, runtimeContextCapture, claudeLaunchSettings, codexPluginProfiles) {
+        this.storage = storage;
+        this.providerPluginPolicy = providerPluginPolicy;
+        this.runtimeContextCapture = runtimeContextCapture;
+        this.claudeLaunchSettings = claudeLaunchSettings;
+        this.codexPluginProfiles = codexPluginProfiles;
+    }
+    async createPlan(input) {
+        const profileOptionArgs = Object.freeze((0, profile_options_1.parseProfileOptions)(input.profileOptions));
+        const effectiveModel = input.agentModelOverride ?? input.configModel ?? (0, profile_options_1.extractModelFromArgs)([...profileOptionArgs]);
+        const effectiveEffort = input.agentEffortOverride ?? input.configEffort ?? null;
+        const providerEnv = this.storage.getProviderEnvForProject(input.provider.id, input.projectId);
+        const pluginPolicy = await this.providerPluginPolicy.resolveAll(input.projectId, input.provider.id);
+        const providerName = input.provider.name.toLowerCase();
+        const frozenProvider = Object.freeze({
+            ...input.provider,
+            env: input.provider.env ? Object.freeze({ ...input.provider.env }) : null,
+        });
+        this.assertNoPolicyConflict(providerName, [...profileOptionArgs], pluginPolicy.length > 0);
+        const environment = (0, env_config_1.getEnvConfig)();
+        const baseInput = Object.freeze({
+            mode: input.mode,
+            ...(input.mode === 'new'
+                ? { sessionId: input.sessionId, initialPrompt: input.initialPrompt }
+                : { providerSessionId: input.providerSessionId }),
+            adapter: input.adapter,
+            profileOptions: input.profileOptions,
+            modelOverride: effectiveModel,
+            effortOverride: effectiveEffort,
+            providerBinPath: input.providerBinPath,
+            providerEnv: providerEnv ? Object.freeze({ ...providerEnv }) : null,
+            configEnv: input.configEnv ? Object.freeze({ ...input.configEnv }) : null,
+            provider: frozenProvider,
+            hookContext: (0, capabilities_1.isHookCapable)(input.adapter)
+                ? Object.freeze({
+                    apiUrl: shared_1.HostResolver.buildInternalBaseUrl({
+                        host: environment.HOST,
+                        port: environment.PORT,
+                    }),
+                    projectId: input.projectId,
+                    agentId: input.agentId,
+                    sessionId: input.sessionId,
+                    tmuxSessionName: input.tmuxSessionName,
+                })
+                : undefined,
+        });
+        const baseConfig = this.freezeConfig((0, provider_launch_config_1.resolve)(baseInput));
+        if (input.mode === 'restore') {
+            this.assertRestoreIdentity(baseConfig, input.provider.name, input.providerSessionId);
+        }
+        return new ProviderRuntimePlanValue(Object.freeze({
+            mode: input.mode,
+            provider: frozenProvider,
+            providerName,
+            projectId: input.projectId,
+            projectName: input.projectName,
+            projectRootPath: input.projectRootPath,
+            sessionId: input.sessionId,
+            providerSessionId: input.mode === 'restore' ? input.providerSessionId : null,
+            profileOptionArgs,
+            pluginPolicy: Object.freeze(pluginPolicy.map(({ pluginId, enabled }) => Object.freeze({ pluginId, enabled }))),
+            baseInput,
+            baseConfig,
+        }));
+    }
+    async materialize(plan) {
+        if (!(plan instanceof ProviderRuntimePlanValue)) {
+            throw new error_types_1.ValidationError('Provider runtime plan was not created by this service.');
+        }
+        const state = plan.state;
+        const priorCapture = state.mode === 'restore' ? this.runtimeContextCapture.snapshot(state.sessionId) : null;
+        let captureStarted = false;
+        let claudePrepared = false;
+        let preparedCodex = null;
+        try {
+            const epoch = this.runtimeContextCapture.rotateEpoch(state.sessionId, state.baseConfig.contextWindowOverride ?? null);
+            captureStarted = true;
+            const preparedSettings = await this.claudeLaunchSettings.prepare({
+                providerName: state.providerName,
+                settingsJson: state.provider.claudeLaunchSettingsJson,
+                profileOptionArgs: [...state.profileOptionArgs],
+                providerEnv: state.baseInput.providerEnv,
+                configEnv: state.baseInput.configEnv,
+                sessionId: state.sessionId,
+                epoch,
+                projectRootPath: state.projectRootPath,
+                pluginPolicy: state.providerName === 'claude' ? state.pluginPolicy : [],
+                policyRequired: state.providerName === 'claude' && state.pluginPolicy.length > 0,
+            });
+            claudePrepared = true;
+            preparedCodex =
+                state.providerName === 'codex'
+                    ? await this.codexPluginProfiles.prepare({
+                        projectId: state.projectId,
+                        projectName: state.projectName,
+                        sessionId: state.sessionId,
+                        pluginPolicy: state.pluginPolicy,
+                        attemptNonce: (0, crypto_1.randomUUID)(),
+                    })
+                    : null;
+            const config = this.applyManagedOverlay(state, preparedSettings, preparedCodex);
+            if (state.mode === 'restore' &&
+                preparedSettings.optionArgs.length + (preparedCodex?.providerOptionArgs.length ?? 0) > 0) {
+                this.assertRestoreIdentity(config, state.providerName, this.restoreProviderSessionId(state));
+            }
+            const finalConfig = this.freezeConfig(preparedCodex ? this.wrapCodexCommand(state, config, preparedCodex) : config);
+            const acknowledgement = preparedCodex;
+            const rollbackState = () => ({
+                mode: state.mode,
+                sessionId: state.sessionId,
+                priorCapture,
+                captureStarted,
+                claudePrepared,
+                preparedCodex,
+            });
+            return Object.freeze({
+                config: finalConfig,
+                afterCommand: acknowledgement
+                    ? async () => {
+                        await this.codexPluginProfiles.awaitAcknowledgement(acknowledgement, {
+                            projectId: state.projectId,
+                            attemptNonce: acknowledgement.attemptNonce,
+                        });
+                    }
+                    : NOOP_AFTER_COMMAND,
+                rollback: async () => this.rollbackPrepared(rollbackState(), false),
+            });
+        }
+        catch (error) {
+            await this.rollbackPrepared({
+                mode: state.mode,
+                sessionId: state.sessionId,
+                priorCapture,
+                captureStarted,
+                claudePrepared,
+                preparedCodex,
+            }, true);
+            throw error;
+        }
+    }
+    assertNoPolicyConflict(providerName, profileOptionArgs, policyActive) {
+        if (policyActive &&
+            providerName === 'claude' &&
+            (0, profile_options_1.hasFlagOccurrence)([...profileOptionArgs], '--settings')) {
+            throw new error_types_1.ConflictError('Profile-supplied --settings conflicts with required DevChain Claude plugin policy.', { field: 'profileOptions', flag: '--settings' });
+        }
+        if (policyActive &&
+            providerName === 'codex' &&
+            (0, profile_options_1.hasCodexProfileSelector)([...profileOptionArgs])) {
+            throw new error_types_1.ConflictError('Profile-supplied Codex profile selector conflicts with required DevChain plugin policy.', { field: 'profileOptions', flag: '--profile' });
+        }
+    }
+    assertRestoreIdentity(config, providerName, providerSessionId) {
+        if (!config.argv.includes(providerSessionId)) {
+            throw new error_types_1.ValidationError('Restore argv does not include provider session ID — adapter contract violation', { providerName, providerSessionId });
+        }
+    }
+    applyManagedOverlay(state, preparedSettings, preparedCodex) {
+        const providerOptionArgs = [
+            ...preparedSettings.optionArgs,
+            ...(preparedCodex?.providerOptionArgs ?? []),
+        ];
+        if (providerOptionArgs.length === 0)
+            return state.baseConfig;
+        return this.freezeConfig((0, provider_launch_config_1.resolve)({
+            ...state.baseInput,
+            providerOptionArgs,
+            runtimeEnv: preparedSettings.runtimeEnv,
+        }));
+    }
+    wrapCodexCommand(state, config, preparedCodex) {
+        const helperArgv = this.codexPluginProfiles.buildHelperArgv(preparedCodex, state.baseInput.providerBinPath, config.argv, { projectId: state.projectId, attemptNonce: preparedCodex.attemptNonce });
+        return {
+            ...config,
+            commandArgs: (0, env_builder_1.buildSessionCommand)(config.env, helperArgv[0], helperArgv.slice(1), [
+                ...new Set([...(state.baseInput.adapter.launchUnsetEnv ?? []), context_window_policy_1.CONTEXT_WINDOW_ENV_KEY]),
+            ]),
+        };
+    }
+    async rollbackPrepared(state, suppressError) {
+        let firstError;
+        const attempt = async (action) => {
+            try {
+                await action();
+            }
+            catch (error) {
+                firstError ??= error;
+            }
+        };
+        if (state.preparedCodex) {
+            const preparedCodex = state.preparedCodex;
+            await attempt(() => this.codexPluginProfiles.cleanupPrepared(preparedCodex));
+        }
+        if (state.claudePrepared) {
+            await attempt(() => this.claudeLaunchSettings.cleanupSession(state.sessionId));
+        }
+        if (state.captureStarted) {
+            await attempt(() => {
+                if (state.mode === 'restore') {
+                    this.runtimeContextCapture.restoreSnapshot(state.sessionId, state.priorCapture);
+                }
+                else {
+                    this.runtimeContextCapture.clear(state.sessionId);
+                }
+            });
+        }
+        if (!suppressError && firstError !== undefined)
+            throw firstError;
+    }
+    restoreProviderSessionId(state) {
+        if (state.providerSessionId === null) {
+            throw new error_types_1.ValidationError('Restore provider session ID is missing from the runtime plan.');
+        }
+        return state.providerSessionId;
+    }
+    freezeConfig(config) {
+        const frozenConfig = {
+            ...config,
+            argv: [...config.argv],
+            commandArgs: [...config.commandArgs],
+            env: config.env ? { ...config.env } : null,
+            promptHandshake: config.promptHandshake
+                ? {
+                    ...config.promptHandshake,
+                    preKeys: config.promptHandshake.preKeys
+                        ? [...config.promptHandshake.preKeys]
+                        : undefined,
+                }
+                : undefined,
+        };
+        Object.freeze(frozenConfig.argv);
+        Object.freeze(frozenConfig.commandArgs);
+        if (frozenConfig.env)
+            Object.freeze(frozenConfig.env);
+        if (frozenConfig.promptHandshake?.preKeys)
+            Object.freeze(frozenConfig.promptHandshake.preKeys);
+        if (frozenConfig.promptHandshake)
+            Object.freeze(frozenConfig.promptHandshake);
+        return Object.freeze(frozenConfig);
+    }
+};
+exports.ProviderRuntimePreparationService = ProviderRuntimePreparationService;
+exports.ProviderRuntimePreparationService = ProviderRuntimePreparationService = __decorate([
+    (0, common_1.Injectable)(),
+    __param(0, (0, common_1.Inject)(storage_interface_1.STORAGE_SERVICE)),
+    __metadata("design:paramtypes", [Object, provider_plugin_policy_service_1.ProviderPluginPolicyService,
+        runtime_context_capture_service_1.RuntimeContextCaptureService,
+        claude_launch_settings_materializer_service_1.ClaudeLaunchSettingsMaterializerService,
+        codex_plugin_profile_materializer_service_1.CodexPluginProfileMaterializerService])
+], ProviderRuntimePreparationService);
+//# sourceMappingURL=provider-runtime-preparation.service.js.map

package/dist/server/modules/sessions/services/provider-runtime-preparation/provider-runtime-preparation.service.js.map

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

package/dist/server/modules/sessions/services/provider-runtime-preparation/provider-runtime-preparation.types.d.ts

@@ -0,0 +1,41 @@
+import type { ProviderAdapter } from '../../../providers/adapters/provider-adapter.interface';
+import type { Provider } from '../../../storage/models/domain.models';
+import type { LaunchConfig } from '../provider-launch-config';
+interface SharedProviderRuntimePlanInput {
+    readonly adapter: ProviderAdapter;
+    readonly provider: Provider;
+    readonly providerBinPath: string;
+    readonly projectId: string;
+    readonly projectName: string;
+    readonly projectRootPath: string;
+    readonly agentId: string;
+    readonly agentModelOverride: string | null | undefined;
+    readonly agentEffortOverride: string | null | undefined;
+    readonly configModel: string | null | undefined;
+    readonly configEffort: string | null | undefined;
+    readonly profileOptions: string | null | undefined;
+    readonly configEnv: Record<string, string> | null;
+    readonly sessionId: string;
+    readonly tmuxSessionName: string;
+}
+export interface NewProviderRuntimePlanInput extends SharedProviderRuntimePlanInput {
+    readonly mode: 'new';
+    readonly initialPrompt?: string;
+    readonly providerSessionId?: never;
+}
+export interface RestoreProviderRuntimePlanInput extends SharedProviderRuntimePlanInput {
+    readonly mode: 'restore';
+    readonly providerSessionId: string;
+    readonly initialPrompt?: never;
+}
+export type ProviderRuntimePlanInput = NewProviderRuntimePlanInput | RestoreProviderRuntimePlanInput;
+export declare abstract class ProviderRuntimePlan {
+    private readonly providerRuntimePlanBrand;
+    protected constructor();
+}
+export interface PreparedProviderRuntime {
+    readonly config: LaunchConfig;
+    readonly afterCommand: () => Promise<void>;
+    readonly rollback: () => Promise<void>;
+}
+export {};

package/dist/server/modules/sessions/services/provider-runtime-preparation/provider-runtime-preparation.types.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProviderRuntimePlan = void 0;
+class ProviderRuntimePlan {
+    constructor() { }
+}
+exports.ProviderRuntimePlan = ProviderRuntimePlan;
+//# sourceMappingURL=provider-runtime-preparation.types.js.map

package/dist/server/modules/sessions/services/provider-runtime-preparation/provider-runtime-preparation.types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider-runtime-preparation.types.js","sourceRoot":"","sources":["../../../../../src/modules/sessions/services/provider-runtime-preparation/provider-runtime-preparation.types.ts"],"names":[],"mappings":";;;AAsCA,MAAsB,mBAAmB;IAGvC,gBAAyB,CAAC;CAC3B;AAJD,kDAIC"}

package/dist/server/modules/sessions/services/session-runtime/__test-utils__/pipeline-harness.d.ts

@@ -124,7 +124,6 @@ export declare function createLaunchPipelineHarness(): {
             getEpic: jest.Mock<any, any, any>;
             getAgentProfile: jest.Mock<any, any, any>;
             getProvider: jest.Mock<any, any, any>;
-            getProviderEnvForProject: jest.Mock<any, any, any>;
             getInitialSessionPrompt: jest.Mock<any, any, any>;
             listProfileProviderConfigsByProfile: jest.Mock<any, any, any>;
         };
@@ -176,26 +175,28 @@ export declare function createLaunchPipelineHarness(): {
             listTeamsByAgent: jest.Mock<any, any, any>;
         };
         runtimeContextCapture: {
-            rotateEpoch: jest.Mock<any, any, any>;
             clear: jest.Mock<any, any, any>;
-            snapshot: jest.Mock<any, any, any>;
-            restoreSnapshot: jest.Mock<any, any, any>;
-            get: jest.Mock<any, any, any>;
-            getEpoch: jest.Mock<any, any, any>;
         };
-        claudeLaunchSettings: {
-            prepare: jest.Mock<any, any, any>;
+        codexPluginProfiles: {
             cleanupSession: jest.Mock<any, any, any>;
-            cleanupSessionSync: jest.Mock<any, any, any>;
         };
-        codexPluginProfiles: {
-            prepare: jest.Mock<any, any, any>;
-            buildHelperArgv: jest.Mock<any, any, any>;
-            awaitAcknowledgement: jest.Mock<any, any, any>;
-            cleanupPrepared: jest.Mock<any, any, any>;
+        providerRuntimePlan: Readonly<{
+            mode: "new";
+        }>;
+        preparedProviderRuntime: {
+            config: {
+                argv: string[];
+                commandArgs: string[];
+                env: null;
+                contextWindowOverride: null;
+                promptHandshake: undefined;
+            };
+            afterCommand: jest.Mock<any, any, any>;
+            rollback: jest.Mock<any, any, any>;
         };
-        providerPluginPolicy: {
-            resolveAll: jest.Mock<any, any, any>;
+        providerRuntimePreparation: {
+            createPlan: jest.Mock<any, any, any>;
+            materialize: jest.Mock<any, any, any>;
         };
     };
 };
@@ -265,7 +266,6 @@ export declare function createRestorePipelineHarness(opts?: {
             getEpic: jest.Mock<any, any, any>;
             getAgentProfile: jest.Mock<any, any, any>;
             getProvider: jest.Mock<any, any, any>;
-            getProviderEnvForProject: jest.Mock<any, any, any>;
             getInitialSessionPrompt: jest.Mock<any, any, any>;
             listProfileProviderConfigsByProfile: jest.Mock<any, any, any>;
         };
@@ -298,27 +298,23 @@ export declare function createRestorePipelineHarness(opts?: {
             publish: jest.Mock<any, any, any>;
         };
         streamService: {};
-        runtimeContextCapture: {
-            rotateEpoch: jest.Mock<any, any, any>;
-            clear: jest.Mock<any, any, any>;
-            snapshot: jest.Mock<any, any, any>;
-            restoreSnapshot: jest.Mock<any, any, any>;
-            get: jest.Mock<any, any, any>;
-            getEpoch: jest.Mock<any, any, any>;
-        };
-        claudeLaunchSettings: {
-            prepare: jest.Mock<any, any, any>;
-            cleanupSession: jest.Mock<any, any, any>;
-            cleanupSessionSync: jest.Mock<any, any, any>;
-        };
-        codexPluginProfiles: {
-            prepare: jest.Mock<any, any, any>;
-            buildHelperArgv: jest.Mock<any, any, any>;
-            awaitAcknowledgement: jest.Mock<any, any, any>;
-            cleanupPrepared: jest.Mock<any, any, any>;
+        providerRuntimePlan: Readonly<{
+            mode: "restore";
+        }>;
+        preparedProviderRuntime: {
+            config: {
+                argv: string[];
+                commandArgs: string[];
+                env: null;
+                contextWindowOverride: null;
+                promptHandshake: undefined;
+            };
+            afterCommand: jest.Mock<any, any, any>;
+            rollback: jest.Mock<any, any, any>;
         };
-        providerPluginPolicy: {
-            resolveAll: jest.Mock<any, any, any>;
+        providerRuntimePreparation: {
+            createPlan: jest.Mock<any, any, any>;
+            materialize: jest.Mock<any, any, any>;
         };
     };
 };

package/dist/server/modules/sessions/services/session-runtime/__test-utils__/pipeline-harness.js

@@ -136,7 +136,6 @@ function createLaunchPipelineHarness() {
         getEpic: jest.fn().mockResolvedValue(fakeEpic()),
         getAgentProfile: jest.fn().mockResolvedValue(fakeProfile()),
         getProvider: jest.fn().mockResolvedValue(fakeProvider()),
-        getProviderEnvForProject: jest.fn().mockReturnValue(null),
         getInitialSessionPrompt: jest.fn().mockResolvedValue(null),
         listProfileProviderConfigsByProfile: jest.fn().mockResolvedValue([fakeProfileProviderConfig()]),
     };
@@ -192,33 +191,29 @@ function createLaunchPipelineHarness() {
         listTeamsByAgent: jest.fn().mockResolvedValue([]),
     };
     const runtimeContextCapture = {
-        rotateEpoch: jest.fn().mockReturnValue('capture-epoch'),
         clear: jest.fn(),
-        snapshot: jest.fn().mockReturnValue(null),
-        restoreSnapshot: jest.fn(),
-        get: jest.fn(),
-        getEpoch: jest.fn(),
     };
-    const claudeLaunchSettings = {
-        prepare: jest.fn().mockResolvedValue({
-            optionArgs: [],
-            runtimeEnv: {},
-            captureEnabled: false,
-        }),
+    const codexPluginProfiles = {
         cleanupSession: jest.fn().mockResolvedValue(undefined),
-        cleanupSessionSync: jest.fn(),
     };
-    const codexPluginProfiles = {
-        prepare: jest.fn().mockResolvedValue(null),
-        buildHelperArgv: jest.fn(),
-        awaitAcknowledgement: jest.fn().mockResolvedValue('/tmp/codex-profile'),
-        cleanupPrepared: jest.fn().mockResolvedValue(undefined),
+    const providerRuntimePlan = Object.freeze({ mode: 'new' });
+    const preparedProviderRuntime = {
+        config: {
+            argv: ['test-provider', '--session', 'new'],
+            commandArgs: ['test-provider', '--session', 'new'],
+            env: null,
+            contextWindowOverride: null,
+            promptHandshake: undefined,
+        },
+        afterCommand: jest.fn().mockResolvedValue(undefined),
+        rollback: jest.fn().mockResolvedValue(undefined),
     };
-    const providerPluginPolicy = {
-        resolveAll: jest.fn().mockResolvedValue([]),
+    const providerRuntimePreparation = {
+        createPlan: jest.fn().mockResolvedValue(providerRuntimePlan),
+        materialize: jest.fn().mockResolvedValue(preparedProviderRuntime),
     };
     const { SessionLaunchPipeline } = require('../session-launch-pipeline.service');
-    const pipeline = new SessionLaunchPipeline(sqliteMock.db, storage, sessionCoordinator, providerAdapterFactory, terminalIO, ptyService, terminalSessionRegistry, hooksConfigService, copilotHooksConfigService, preflightService, mcpEnsureService, eventsService, teamsService, runtimeContextCapture, claudeLaunchSettings, codexPluginProfiles, providerPluginPolicy);
+    const pipeline = new SessionLaunchPipeline(sqliteMock.db, storage, sessionCoordinator, providerAdapterFactory, terminalIO, ptyService, terminalSessionRegistry, hooksConfigService, copilotHooksConfigService, preflightService, mcpEnsureService, eventsService, teamsService, runtimeContextCapture, codexPluginProfiles, providerRuntimePreparation);
     return {
         pipeline,
         mocks: {
@@ -237,25 +232,22 @@ function createLaunchPipelineHarness() {
             eventsService,
             teamsService,
             runtimeContextCapture,
-            claudeLaunchSettings,
             codexPluginProfiles,
-            providerPluginPolicy,
+            providerRuntimePlan,
+            preparedProviderRuntime,
+            providerRuntimePreparation,
         },
     };
 }
 function createRestorePipelineHarness(opts) {
     const sqliteMock = createSqliteMock();
     const adapter = createMockAdapter();
-    adapter.buildLaunchArgs.mockImplementation((input) => ({
-        argv: ['test-provider', '--resume', input.providerSessionId ?? 'sess-id'],
-    }));
     const storage = {
         getAgent: jest.fn().mockResolvedValue(fakeAgent()),
         getProject: jest.fn().mockResolvedValue(fakeProject()),
         getEpic: jest.fn().mockResolvedValue(fakeEpic()),
         getAgentProfile: jest.fn().mockResolvedValue(fakeProfile()),
         getProvider: jest.fn().mockResolvedValue(fakeProvider()),
-        getProviderEnvForProject: jest.fn().mockReturnValue(null),
         getInitialSessionPrompt: jest.fn().mockResolvedValue(null),
         listProfileProviderConfigsByProfile: jest.fn().mockResolvedValue([fakeProfileProviderConfig()]),
     };
@@ -296,31 +288,21 @@ function createRestorePipelineHarness(opts) {
         getBufferStats: jest.fn(),
         initializeBuffer: jest.fn(),
     };
-    const runtimeContextCapture = {
-        rotateEpoch: jest.fn().mockReturnValue('capture-epoch'),
-        clear: jest.fn(),
-        snapshot: jest.fn().mockReturnValue(null),
-        restoreSnapshot: jest.fn(),
-        get: jest.fn(),
-        getEpoch: jest.fn(),
-    };
-    const claudeLaunchSettings = {
-        prepare: jest.fn().mockResolvedValue({
-            optionArgs: [],
-            runtimeEnv: {},
-            captureEnabled: false,
-        }),
-        cleanupSession: jest.fn().mockResolvedValue(undefined),
-        cleanupSessionSync: jest.fn(),
-    };
-    const codexPluginProfiles = {
-        prepare: jest.fn().mockResolvedValue(null),
-        buildHelperArgv: jest.fn(),
-        awaitAcknowledgement: jest.fn().mockResolvedValue('/tmp/codex-profile'),
-        cleanupPrepared: jest.fn().mockResolvedValue(undefined),
+    const providerRuntimePlan = Object.freeze({ mode: 'restore' });
+    const preparedProviderRuntime = {
+        config: {
+            argv: ['test-provider', '--resume', 'provider-session-1'],
+            commandArgs: ['test-provider', '--resume', 'provider-session-1'],
+            env: null,
+            contextWindowOverride: null,
+            promptHandshake: undefined,
+        },
+        afterCommand: jest.fn().mockResolvedValue(undefined),
+        rollback: jest.fn().mockResolvedValue(undefined),
     };
-    const providerPluginPolicy = {
-        resolveAll: jest.fn().mockResolvedValue([]),
+    const providerRuntimePreparation = {
+        createPlan: jest.fn().mockResolvedValue(providerRuntimePlan),
+        materialize: jest.fn().mockResolvedValue(preparedProviderRuntime),
     };
     const stoppedSessionRow = {
         id: 'session-1',
@@ -361,7 +343,7 @@ function createRestorePipelineHarness(opts) {
         return updateStmt;
     });
     const { SessionRestorePipeline } = require('../session-restore-pipeline.service');
-    const pipeline = new SessionRestorePipeline(sqliteMock.db, storage, sessionCoordinator, providerAdapterFactory, terminalIO, ptyService, terminalSessionRegistry, eventsService, streamService, runtimeContextCapture, claudeLaunchSettings, codexPluginProfiles, providerPluginPolicy);
+    const pipeline = new SessionRestorePipeline(sqliteMock.db, storage, sessionCoordinator, providerAdapterFactory, terminalIO, ptyService, terminalSessionRegistry, eventsService, streamService, providerRuntimePreparation);
     function createTrackedPrepare(runCalls) {
         return (sql) => {
             const upper = sql.trim().toUpperCase();
@@ -402,10 +384,9 @@ function createRestorePipelineHarness(opts) {
             terminalSessionRegistry,
             eventsService,
             streamService,
-            runtimeContextCapture,
-            claudeLaunchSettings,
-            codexPluginProfiles,
-            providerPluginPolicy,
+            providerRuntimePlan,
+            preparedProviderRuntime,
+            providerRuntimePreparation,
         },
     };
 }