devchain-cli 0.12.1 → 0.12.3

package/dist/server/modules/sessions/services/sessions.service.js

@@ -14,6 +14,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SessionsService = void 0;
 const common_1 = require("@nestjs/common");
+const promises_1 = require("fs/promises");
 const error_types_1 = require("../../../common/errors/error-types");
 const confirmed_delivery_helper_1 = require("../../terminal/services/confirmed-delivery.helper");
 const core_1 = require("@nestjs/core");
@@ -38,6 +39,7 @@ const hooks_config_service_1 = require("../../hooks/services/hooks-config.servic
 const provider_adapter_factory_1 = require("../../providers/adapters/provider-adapter.factory");
 const teams_service_1 = require("../../teams/services/teams.service");
 const env_config_1 = require("../../../common/config/env.config");
+const host_helpers_1 = require("../../../common/config/host-helpers");
 const logger = (0, logger_1.createLogger)('SessionsService');
 const BOOT_ID = (0, crypto_1.randomUUID)();
 function isUniqueConstraintError(error) {
@@ -67,6 +69,135 @@ let SessionsService = class SessionsService {
         this.sqlite = this.db.session?.client ?? this.db;
         logger.info('SessionsService initialized');
     }
+    async resolveLaunchTarget(params) {
+        const { agentId, projectId, epicId } = params;
+        const agent = await this.storage.getAgent(agentId);
+        const project = await this.storage.getProject(projectId);
+        if (agent.projectId !== projectId) {
+            throw new error_types_1.ValidationError(`Agent ${agentId} does not belong to project ${projectId}.`, {
+                agentId,
+                agentProjectId: agent.projectId,
+                requestedProjectId: projectId,
+            });
+        }
+        const epic = epicId ? await this.storage.getEpic(epicId) : null;
+        const profile = await this.storage.getAgentProfile(agent.profileId);
+        let provider;
+        let options;
+        let configEnv = null;
+        if (agent.providerConfigId) {
+            const config = await this.storage.getProfileProviderConfig(agent.providerConfigId);
+            provider = await this.storage.getProvider(config.providerId);
+            options = config.options;
+            configEnv = config.env;
+            logger.info({ agentId, configId: config.id, providerId: provider.id }, 'Resolved provider via config');
+        }
+        else {
+            const configs = await this.storage.listProfileProviderConfigsByProfile(profile.id);
+            if (configs.length > 0) {
+                const firstConfig = configs[0];
+                provider = await this.storage.getProvider(firstConfig.providerId);
+                options = firstConfig.options;
+                configEnv = firstConfig.env;
+                logger.info({ agentId, profileId: profile.id, configId: firstConfig.id, providerId: provider.id }, 'Resolved provider via first profile config (no providerConfigId set on agent)');
+            }
+            else {
+                throw new error_types_1.ValidationError(`Profile ${profile.id} has no provider configs - cannot launch session`);
+            }
+        }
+        return { agent, project, epic, profile, provider, options, configEnv };
+    }
+    verifyProviderBinary(provider) {
+        if (!provider.binPath) {
+            throw new error_types_1.ValidationError(`Provider ${provider.name} is missing a binary path. Set the path before launching sessions.`, {
+                code: 'PROVIDER_BINARY_NOT_FOUND',
+                providerId: provider.id,
+                providerName: provider.name,
+            });
+        }
+    }
+    composeLaunchEnv(params) {
+        const { sessionId, tmuxSessionName, projectId, agentId, provider, configEnv, optionArgs } = params;
+        const providerEnv = provider.env ?? {};
+        const mergedBaseEnv = { ...providerEnv, ...(configEnv ?? {}) };
+        let envVars = Object.keys(mergedBaseEnv).length > 0 ? mergedBaseEnv : null;
+        let processedOptionArgs = optionArgs;
+        if (provider.name.toLowerCase() === 'claude') {
+            const env = (0, env_config_1.getEnvConfig)();
+            const devchainEnv = {
+                DEVCHAIN_API_URL: (0, host_helpers_1.getRuntimeInternalBaseUrl)(env),
+                DEVCHAIN_PROJECT_ID: projectId,
+                DEVCHAIN_AGENT_ID: agentId,
+                DEVCHAIN_SESSION_ID: sessionId,
+                DEVCHAIN_TMUX_SESSION_NAME: tmuxSessionName,
+            };
+            if (provider.oneMillionContextEnabled) {
+                processedOptionArgs = (0, profile_options_1.rewriteModelTo1m)(processedOptionArgs);
+            }
+            const modelStr = (0, profile_options_1.extractModelFromArgs)(processedOptionArgs);
+            const family = modelStr ? (0, profile_options_1.detectClaudeModelFamily)(modelStr) : null;
+            if (provider.oneMillionContextEnabled &&
+                family === 'opus' &&
+                provider.autoCompactThreshold1m != null) {
+                devchainEnv.CLAUDE_AUTOCOMPACT_PCT_OVERRIDE = String(provider.autoCompactThreshold1m);
+            }
+            else if (provider.autoCompactThreshold != null) {
+                devchainEnv.CLAUDE_AUTOCOMPACT_PCT_OVERRIDE = String(provider.autoCompactThreshold);
+            }
+            envVars = { ...devchainEnv, ...providerEnv, ...(configEnv ?? {}) };
+            delete envVars.CLAUDE_CODE_DISABLE_1M_CONTEXT;
+        }
+        return { envVars, processedOptionArgs };
+    }
+    async ensureMcpConfig(provider, projectRootPath) {
+        let preflightResult = await this.preflightService.runChecks(projectRootPath);
+        let providerCheck = preflightResult.providers?.find((p) => p.id === provider.id);
+        if (providerCheck?.mcpStatus && providerCheck.mcpStatus !== 'pass') {
+            logger.info({
+                providerId: provider.id,
+                providerName: provider.name,
+                mcpStatus: providerCheck.mcpStatus,
+            }, 'MCP not configured, attempting auto-ensure');
+            const ensureResult = await this.mcpEnsureService.ensureMcp(provider, projectRootPath);
+            if (ensureResult.success) {
+                logger.info({ providerId: provider.id, action: ensureResult.action }, 'MCP auto-configured successfully');
+                if (ensureResult.warnings?.length) {
+                    for (const w of ensureResult.warnings) {
+                        logger.warn({ providerId: provider.id, ...w }, 'MCP ensure warning');
+                    }
+                }
+                preflightResult = await this.preflightService.runChecks(projectRootPath);
+                providerCheck = preflightResult.providers?.find((p) => p.id === provider.id);
+            }
+            else {
+                logger.warn({ providerId: provider.id, message: ensureResult.message }, 'MCP auto-ensure failed');
+            }
+            if (providerCheck?.mcpStatus && providerCheck.mcpStatus !== 'pass') {
+                throw new error_types_1.ValidationError('Provider MCP is not configured', {
+                    code: 'MCP_NOT_CONFIGURED',
+                    providerId: provider.id,
+                    providerName: provider.name,
+                    mcpStatus: providerCheck.mcpStatus,
+                    mcpMessage: providerCheck.mcpMessage,
+                });
+            }
+        }
+        else if (provider.name.toLowerCase() === 'gemini' && projectRootPath) {
+            await this.mcpEnsureService.ensureMcp(provider, projectRootPath);
+        }
+        return preflightResult;
+    }
+    async setupHooksConfig(provider, projectRootPath) {
+        if (provider.name.toLowerCase() !== 'claude')
+            return;
+        try {
+            await this.hooksConfigService.ensureHooksConfig(projectRootPath);
+            logger.info({ projectRootPath }, 'Hooks config ensured for Claude provider');
+        }
+        catch (error) {
+            logger.warn({ error }, 'Failed to ensure hooks config (non-fatal)');
+        }
+    }
     async launchSession(data) {
         const { epicId, agentId, projectId, options: launchOptions } = data;
         const silent = launchOptions?.silent === true;
@@ -119,40 +250,7 @@ let SessionsService = class SessionsService {
                     .run(new Date().toISOString(), new Date().toISOString(), existingSession.id);
                 logger.info({ agentId }, 'Orphaned session cleaned up, proceeding to create new session');
             }
-            const agent = await this.storage.getAgent(agentId);
-            const project = await this.storage.getProject(projectId);
-            if (agent.projectId !== projectId) {
-                throw new error_types_1.ValidationError(`Agent ${agentId} does not belong to project ${projectId}.`, {
-                    agentId,
-                    agentProjectId: agent.projectId,
-                    requestedProjectId: projectId,
-                });
-            }
-            const epic = epicId ? await this.storage.getEpic(epicId) : null;
-            const profile = await this.storage.getAgentProfile(agent.profileId);
-            let provider;
-            let options;
-            let configEnv = null;
-            if (agent.providerConfigId) {
-                const config = await this.storage.getProfileProviderConfig(agent.providerConfigId);
-                provider = await this.storage.getProvider(config.providerId);
-                options = config.options;
-                configEnv = config.env;
-                logger.info({ agentId, configId: config.id, providerId: provider.id }, 'Resolved provider via config');
-            }
-            else {
-                const configs = await this.storage.listProfileProviderConfigsByProfile(profile.id);
-                if (configs.length > 0) {
-                    const firstConfig = configs[0];
-                    provider = await this.storage.getProvider(firstConfig.providerId);
-                    options = firstConfig.options;
-                    configEnv = firstConfig.env;
-                    logger.info({ agentId, profileId: profile.id, configId: firstConfig.id, providerId: provider.id }, 'Resolved provider via first profile config (no providerConfigId set on agent)');
-                }
-                else {
-                    throw new error_types_1.ValidationError(`Profile ${profile.id} has no provider configs - cannot launch session`);
-                }
-            }
+            const { agent, project, epic, profile, provider, options, configEnv } = await this.resolveLaunchTarget({ agentId, projectId, epicId });
             if (provider.name.toLowerCase() === 'claude') {
                 const { autoCompactEnabled, configState } = await (0, claude_config_1.checkClaudeAutoCompact)();
                 if (!autoCompactEnabled && configState !== 'malformed') {
@@ -167,42 +265,8 @@ let SessionsService = class SessionsService {
                     });
                 }
             }
-            let preflightResult = await this.preflightService.runChecks(project.rootPath);
-            let providerCheck = preflightResult.providers?.find((p) => p.id === provider.id);
-            if (providerCheck?.mcpStatus && providerCheck.mcpStatus !== 'pass') {
-                logger.info({
-                    providerId: provider.id,
-                    providerName: provider.name,
-                    mcpStatus: providerCheck.mcpStatus,
-                }, 'MCP not configured, attempting auto-ensure');
-                const ensureResult = await this.mcpEnsureService.ensureMcp(provider, project.rootPath);
-                if (ensureResult.success) {
-                    logger.info({ providerId: provider.id, action: ensureResult.action }, 'MCP auto-configured successfully');
-                    preflightResult = await this.preflightService.runChecks(project.rootPath);
-                    providerCheck = preflightResult.providers?.find((p) => p.id === provider.id);
-                }
-                else {
-                    logger.warn({ providerId: provider.id, message: ensureResult.message }, 'MCP auto-ensure failed');
-                }
-                if (providerCheck?.mcpStatus && providerCheck.mcpStatus !== 'pass') {
-                    throw new error_types_1.ValidationError('Provider MCP is not configured', {
-                        code: 'MCP_NOT_CONFIGURED',
-                        providerId: provider.id,
-                        providerName: provider.name,
-                        mcpStatus: providerCheck.mcpStatus,
-                        mcpMessage: providerCheck.mcpMessage,
-                    });
-                }
-            }
-            if (provider.name.toLowerCase() === 'claude') {
-                try {
-                    await this.hooksConfigService.ensureHooksConfig(project.rootPath);
-                    logger.info({ projectId, projectRootPath: project.rootPath }, 'Hooks config ensured for Claude provider');
-                }
-                catch (error) {
-                    logger.warn({ error, projectId }, 'Failed to ensure hooks config (non-fatal)');
-                }
-            }
+            const preflightResult = await this.ensureMcpConfig(provider, project.rootPath);
+            await this.setupHooksConfig(provider, project.rootPath);
             if (preflightResult.overall === 'fail') {
                 const failedChecks = preflightResult.checks
                     .filter((c) => c.status === 'fail')
@@ -224,12 +288,7 @@ let SessionsService = class SessionsService {
             await this.tmuxService.createSession(tmuxSessionName, project.rootPath);
             await this.tmuxService.setAlternateScreenOff(tmuxSessionName);
             this.tmuxService.startHealthCheck(tmuxSessionName, sessionId);
-            if (!provider.binPath) {
-                throw new error_types_1.ValidationError(`Provider ${provider.name} is missing a binary path. Set the path before launching sessions.`, {
-                    providerId: provider.id,
-                    providerName: provider.name,
-                });
-            }
+            this.verifyProviderBinary(provider);
             let optionArgs = [];
             try {
                 optionArgs = (0, profile_options_1.parseProfileOptions)(options);
@@ -246,37 +305,29 @@ let SessionsService = class SessionsService {
             if (agent.modelOverride) {
                 optionArgs = (0, profile_options_1.injectModelOverride)(optionArgs, agent.modelOverride);
             }
-            const providerEnv = provider.env ?? {};
-            const mergedBaseEnv = { ...providerEnv, ...(configEnv ?? {}) };
-            let envVars = Object.keys(mergedBaseEnv).length > 0 ? mergedBaseEnv : null;
-            if (provider.name.toLowerCase() === 'claude') {
-                const env = (0, env_config_1.getEnvConfig)();
-                const devchainEnv = {
-                    DEVCHAIN_API_URL: `http://127.0.0.1:${env.PORT}`,
-                    DEVCHAIN_PROJECT_ID: projectId,
-                    DEVCHAIN_AGENT_ID: agentId,
-                    DEVCHAIN_SESSION_ID: sessionId,
-                    DEVCHAIN_TMUX_SESSION_NAME: tmuxSessionName,
-                };
-                if (provider.oneMillionContextEnabled) {
-                    optionArgs = (0, profile_options_1.rewriteModelTo1m)(optionArgs);
-                }
-                const modelStr = (0, profile_options_1.extractModelFromArgs)(optionArgs);
-                const family = modelStr ? (0, profile_options_1.detectClaudeModelFamily)(modelStr) : null;
-                if (provider.oneMillionContextEnabled &&
-                    family === 'opus' &&
-                    provider.autoCompactThreshold1m != null) {
-                    devchainEnv.CLAUDE_AUTOCOMPACT_PCT_OVERRIDE = String(provider.autoCompactThreshold1m);
-                }
-                else if (provider.autoCompactThreshold != null) {
-                    devchainEnv.CLAUDE_AUTOCOMPACT_PCT_OVERRIDE = String(provider.autoCompactThreshold);
-                }
-                envVars = { ...devchainEnv, ...providerEnv, ...(configEnv ?? {}) };
-                delete envVars.CLAUDE_CODE_DISABLE_1M_CONTEXT;
+            const { envVars, processedOptionArgs } = this.composeLaunchEnv({
+                sessionId,
+                tmuxSessionName,
+                projectId,
+                agentId,
+                provider,
+                configEnv,
+                optionArgs,
+            });
+            optionArgs = processedOptionArgs;
+            let launchArgv = optionArgs;
+            try {
+                const launchAdapter = this.providerAdapterFactory.getAdapter(provider.name);
+                launchArgv = launchAdapter.buildLaunchArgs({
+                    mode: 'new',
+                    profileOptionArgs: optionArgs,
+                }).argv;
+            }
+            catch {
             }
             let commandArgs;
             try {
-                commandArgs = (0, env_builder_1.buildSessionCommand)(envVars, provider.binPath, optionArgs);
+                commandArgs = (0, env_builder_1.buildSessionCommand)(envVars, provider.binPath, launchArgv);
             }
             catch (error) {
                 if (error instanceof env_builder_1.EnvBuilderError) {
@@ -290,10 +341,10 @@ let SessionsService = class SessionsService {
             try {
                 this.sqlite
                     .prepare(`
-          INSERT INTO sessions (id, epic_id, agent_id, tmux_session_id, status, started_at, created_at, updated_at)
-          VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+          INSERT INTO sessions (id, epic_id, agent_id, tmux_session_id, status, started_at, provider_name_at_launch, created_at, updated_at)
+          VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
         `)
-                    .run(sessionId, epicId ?? null, agentId, tmuxSessionName, 'running', now, now, now);
+                    .run(sessionId, epicId ?? null, agentId, tmuxSessionName, 'running', now, provider.name.toLowerCase(), now, now);
                 logger.info({ sessionId, tmuxSessionName }, 'Session created in database');
             }
             catch (error) {
@@ -427,7 +478,6 @@ let SessionsService = class SessionsService {
                 startedAt: now,
                 endedAt: null,
                 transcriptPath: null,
-                claudeSessionId: null,
                 createdAt: now,
                 updatedAt: now,
                 epic: epic
@@ -450,6 +500,236 @@ let SessionsService = class SessionsService {
             };
         });
     }
+    async restoreSession(sessionId, projectId) {
+        const source = this.sqlite
+            .prepare(`SELECT id, epic_id, agent_id, tmux_session_id, status, started_at, ended_at,
+                transcript_path, provider_session_id, provider_name_at_launch, created_at, updated_at
+         FROM sessions WHERE id = ?`)
+            .get(sessionId);
+        if (!source) {
+            throw new common_1.NotFoundException('Session not found');
+        }
+        const sourceAgent = await this.storage.getAgent(source.agent_id);
+        if (sourceAgent.projectId !== projectId) {
+            throw new common_1.ForbiddenException('PROJECT_MISMATCH');
+        }
+        if (source.status !== 'stopped' && source.status !== 'failed') {
+            throw new common_1.ConflictException({
+                message: 'Session is not in a restorable state',
+                code: 'INVALID_SESSION_STATE',
+            });
+        }
+        if (!source.provider_session_id) {
+            throw new common_1.ConflictException({
+                message: 'Session has no provider session ID',
+                code: 'NO_PROVIDER_SESSION_ID',
+            });
+        }
+        const { provider: currentProvider } = await this.resolveLaunchTarget({
+            agentId: source.agent_id,
+            projectId,
+            epicId: source.epic_id,
+        });
+        if (source.provider_name_at_launch &&
+            currentProvider.name.toLowerCase() !== source.provider_name_at_launch.toLowerCase()) {
+            throw new common_1.ConflictException({
+                message: 'Current provider differs from launch-time provider',
+                code: 'PROVIDER_MISMATCH',
+            });
+        }
+        return this.sessionCoordinator.withAgentLock(source.agent_id, async () => {
+            const lockedSource = this.sqlite
+                .prepare(`SELECT id, epic_id, agent_id, tmux_session_id, status, started_at, ended_at,
+                  transcript_path, provider_session_id, provider_name_at_launch, created_at, updated_at
+           FROM sessions WHERE id = ?`)
+                .get(sessionId);
+            if (!lockedSource) {
+                throw new common_1.NotFoundException('Session not found');
+            }
+            if (lockedSource.status !== 'stopped' && lockedSource.status !== 'failed') {
+                throw new common_1.ConflictException({
+                    message: 'Session is not in a restorable state',
+                    code: 'INVALID_SESSION_STATE',
+                });
+            }
+            if (!lockedSource.provider_session_id) {
+                throw new common_1.ConflictException({
+                    message: 'Session has no provider session ID',
+                    code: 'NO_PROVIDER_SESSION_ID',
+                });
+            }
+            if (lockedSource.provider_name_at_launch &&
+                currentProvider.name.toLowerCase() !== lockedSource.provider_name_at_launch.toLowerCase()) {
+                throw new common_1.ConflictException({
+                    message: 'Current provider differs from launch-time provider',
+                    code: 'PROVIDER_MISMATCH',
+                });
+            }
+            const existingRunning = this.getActiveSessionForAgent(lockedSource.agent_id);
+            if (existingRunning) {
+                throw new common_1.ConflictException({
+                    message: 'Agent already has a running session',
+                    code: 'INVALID_SESSION_STATE',
+                });
+            }
+            const prior = {
+                status: lockedSource.status,
+                ended_at: lockedSource.ended_at,
+                tmux_session_id: lockedSource.tmux_session_id,
+            };
+            const { agent, project, epic, profile, provider, options, configEnv } = await this.resolveLaunchTarget({
+                agentId: lockedSource.agent_id,
+                projectId,
+                epicId: lockedSource.epic_id,
+            });
+            this.verifyProviderBinary(provider);
+            if (lockedSource.provider_name_at_launch &&
+                provider.name.toLowerCase() !== lockedSource.provider_name_at_launch.toLowerCase()) {
+                throw new common_1.ConflictException({
+                    message: 'Current provider differs from launch-time provider',
+                    code: 'PROVIDER_MISMATCH',
+                });
+            }
+            let optionArgs = [];
+            try {
+                optionArgs = (0, profile_options_1.parseProfileOptions)(options);
+            }
+            catch (error) {
+                if (error instanceof profile_options_1.ProfileOptionsError) {
+                    throw new error_types_1.ValidationError(error.message, {
+                        profileId: profile.id,
+                        profileName: profile.name,
+                    });
+                }
+                throw error;
+            }
+            if (agent.modelOverride) {
+                optionArgs = (0, profile_options_1.injectModelOverride)(optionArgs, agent.modelOverride);
+            }
+            const projectSlug = project.name
+                .toLowerCase()
+                .replace(/[^a-z0-9]+/g, '-')
+                .replace(/(^-|-$)/g, '');
+            const epicSegment = lockedSource.epic_id ?? 'independent';
+            const tmuxSessionName = this.tmuxService.createSessionName(projectSlug, epicSegment, agent.id, lockedSource.id);
+            const { envVars, processedOptionArgs } = this.composeLaunchEnv({
+                sessionId: lockedSource.id,
+                tmuxSessionName,
+                projectId,
+                agentId: agent.id,
+                provider,
+                configEnv,
+                optionArgs,
+            });
+            optionArgs = processedOptionArgs;
+            const adapter = this.providerAdapterFactory.getAdapter(provider.name);
+            const launchArgv = adapter.buildLaunchArgs({
+                mode: 'restore',
+                providerSessionId: lockedSource.provider_session_id,
+                profileOptionArgs: optionArgs,
+            }).argv;
+            if (!launchArgv.includes(lockedSource.provider_session_id)) {
+                throw new error_types_1.ValidationError('Restore argv does not include provider session ID — adapter contract violation', {
+                    code: 'RESTORE_ARGS_UNAVAILABLE',
+                    providerName: provider.name,
+                    providerSessionId: lockedSource.provider_session_id,
+                });
+            }
+            let commandArgs;
+            try {
+                commandArgs = (0, env_builder_1.buildSessionCommand)(envVars, provider.binPath, launchArgv);
+            }
+            catch (error) {
+                if (error instanceof env_builder_1.EnvBuilderError) {
+                    throw new error_types_1.ValidationError(error.message, {
+                        agentId: agent.id,
+                        providerConfigId: agent.providerConfigId,
+                    });
+                }
+                throw error;
+            }
+            const now = new Date().toISOString();
+            this.sqlite
+                .prepare(`UPDATE sessions
+           SET status = 'running', tmux_session_id = ?, ended_at = NULL,
+               last_activity_at = ?, updated_at = ?
+           WHERE id = ?`)
+                .run(tmuxSessionName, now, now, lockedSource.id);
+            try {
+                await this.tmuxService.createSession(tmuxSessionName, project.rootPath);
+            }
+            catch (tmuxError) {
+                this.sqlite
+                    .prepare(`UPDATE sessions
+             SET status = ?, ended_at = ?, tmux_session_id = ?, updated_at = ?
+             WHERE id = ?`)
+                    .run(prior.status, prior.ended_at, prior.tmux_session_id, now, lockedSource.id);
+                logger.error({ sessionId: lockedSource.id, error: String(tmuxError) }, 'Restore failed: tmux creation error — rolled back');
+                throw new common_1.InternalServerErrorException('RESTORE_FAILED');
+            }
+            await this.tmuxService.setAlternateScreenOff(tmuxSessionName);
+            this.tmuxService.startHealthCheck(tmuxSessionName, lockedSource.id);
+            try {
+                await this.tmuxService.sendCommandArgs(tmuxSessionName, commandArgs);
+            }
+            catch (sendError) {
+                this.sqlite
+                    .prepare(`UPDATE sessions
+             SET status = ?, ended_at = ?, tmux_session_id = ?, updated_at = ?
+             WHERE id = ?`)
+                    .run(prior.status, prior.ended_at, prior.tmux_session_id, now, lockedSource.id);
+                try {
+                    await this.tmuxService.destroySession(tmuxSessionName);
+                }
+                catch (destroyErr) {
+                    logger.warn({ tmuxSessionName, error: String(destroyErr) }, 'Failed to destroy tmux session during restore rollback');
+                }
+                logger.error({ sessionId: lockedSource.id, error: String(sendError) }, 'Restore failed: CLI launch error — rolled back');
+                throw new common_1.InternalServerErrorException('RESTORE_FAILED');
+            }
+            await this.ptyService.startStreaming(lockedSource.id, tmuxSessionName);
+            await this.getEventsService().publish('session.restored', {
+                sessionId: lockedSource.id,
+                epicId: lockedSource.epic_id,
+                agentId: agent.id,
+                tmuxSessionName,
+            });
+            if (lockedSource.transcript_path) {
+                await this.getEventsService().publish('session.transcript.discovered', {
+                    sessionId: lockedSource.id,
+                    agentId: agent.id,
+                    projectId,
+                    transcriptPath: lockedSource.transcript_path,
+                    providerName: provider.name.toLowerCase(),
+                });
+            }
+            try {
+                this.getTerminalGateway().broadcastEvent(`agent/${agent.id}`, 'presence', {
+                    online: true,
+                    sessionId: lockedSource.id,
+                    agentId: agent.id,
+                });
+            }
+            catch (error) {
+                logger.warn({ error, agentId: agent.id }, 'Failed to broadcast presence after restore');
+            }
+            return {
+                id: lockedSource.id,
+                epicId: lockedSource.epic_id,
+                agentId: agent.id,
+                tmuxSessionId: tmuxSessionName,
+                status: 'running',
+                startedAt: lockedSource.started_at,
+                endedAt: null,
+                transcriptPath: lockedSource.transcript_path,
+                createdAt: lockedSource.created_at,
+                updatedAt: now,
+                epic: epic ? { id: epic.id, title: epic.title, projectId: epic.projectId } : null,
+                agent: { id: agent.id, name: agent.name, profileId: agent.profileId },
+                project: { id: project.id, name: project.name, rootPath: project.rootPath },
+            };
+        });
+    }
     async terminateSession(sessionId) {
         logger.info({ sessionId }, 'Terminating session');
         const session = this.getSession(sessionId);
@@ -471,14 +751,24 @@ let SessionsService = class SessionsService {
                 logger.warn({ sessionId, tmuxSessionId: session.tmuxSessionId }, 'Tmux session already gone, cleaning up database record');
             }
         }
+        let sizeBytes = null;
+        if (session.transcriptPath) {
+            try {
+                const fileStat = await (0, promises_1.stat)(session.transcriptPath);
+                sizeBytes = fileStat.size;
+            }
+            catch (error) {
+                logger.warn({ error, sessionId, transcriptPath: session.transcriptPath }, 'Could not stat transcript file for size_bytes — leaving NULL (best-effort)');
+            }
+        }
         const now = new Date().toISOString();
         this.sqlite
             .prepare(`
       UPDATE sessions
-      SET status = ?, ended_at = ?, updated_at = ?
+      SET status = ?, ended_at = ?, size_bytes = ?, updated_at = ?
       WHERE id = ?
     `)
-            .run('stopped', now, now, sessionId);
+            .run('stopped', now, sizeBytes, now, sessionId);
         logger.info({ sessionId }, 'Session terminated');
         await this.getEventsService().publish('session.stopped', { sessionId });
         if (session.agentId) {
@@ -494,10 +784,86 @@ let SessionsService = class SessionsService {
             }
         }
     }
+    async getAgentSessionHistory(agentId, projectId, cursor, limit) {
+        const agent = await this.storage.getAgent(agentId);
+        if (agent.projectId !== projectId) {
+            throw new common_1.ForbiddenException('PROJECT_MISMATCH');
+        }
+        const clampedLimit = Math.min(Math.max(1, limit), 100);
+        const sortExpr = `COALESCE(last_activity_at, ended_at, started_at)`;
+        const selectCols = `id, provider_session_id, provider_name_at_launch, status, started_at, ended_at, last_activity_at, size_bytes, transcript_path`;
+        const baseStatus = `status IN ('stopped','failed')`;
+        const { cnt: total } = this.sqlite
+            .prepare(`SELECT COUNT(*) as cnt FROM sessions WHERE agent_id = ? AND ${baseStatus}`)
+            .get(agentId);
+        let cursorSortKey = null;
+        let cursorId = null;
+        if (cursor) {
+            try {
+                const decoded = JSON.parse(Buffer.from(cursor, 'base64url').toString('utf-8'));
+                cursorSortKey = decoded.s;
+                cursorId = decoded.i;
+            }
+            catch {
+            }
+        }
+        let rows;
+        if (cursorSortKey && cursorId) {
+            rows = this.sqlite
+                .prepare(`SELECT ${selectCols} FROM sessions
+           WHERE agent_id = ? AND ${baseStatus}
+             AND (${sortExpr} < ? OR (${sortExpr} = ? AND id < ?))
+           ORDER BY ${sortExpr} DESC, id DESC
+           LIMIT ?`)
+                .all(agentId, cursorSortKey, cursorSortKey, cursorId, clampedLimit + 1);
+        }
+        else {
+            rows = this.sqlite
+                .prepare(`SELECT ${selectCols} FROM sessions
+           WHERE agent_id = ? AND ${baseStatus}
+           ORDER BY ${sortExpr} DESC, id DESC
+           LIMIT ?`)
+                .all(agentId, clampedLimit + 1);
+        }
+        const hasMore = rows.length > clampedLimit;
+        const pageRows = hasMore ? rows.slice(0, clampedLimit) : rows;
+        const now = new Date().toISOString();
+        for (const row of pageRows) {
+            if (row.size_bytes === null && row.transcript_path !== null) {
+                try {
+                    const fileStat = await (0, promises_1.stat)(row.transcript_path);
+                    this.sqlite
+                        .prepare(`UPDATE sessions SET size_bytes = ?, updated_at = ? WHERE id = ?`)
+                        .run(fileStat.size, now, row.id);
+                    row.size_bytes = fileStat.size;
+                }
+                catch {
+                }
+            }
+        }
+        let nextCursor = null;
+        if (hasMore && pageRows.length > 0) {
+            const last = pageRows[pageRows.length - 1];
+            const sortKey = last.last_activity_at ?? last.ended_at ?? last.started_at;
+            nextCursor = Buffer.from(JSON.stringify({ s: sortKey, i: last.id })).toString('base64url');
+        }
+        const items = pageRows.map((row) => ({
+            id: row.id,
+            providerSessionId: row.provider_session_id ?? null,
+            providerNameAtLaunch: row.provider_name_at_launch,
+            status: row.status,
+            startedAt: row.started_at,
+            endedAt: row.ended_at,
+            lastActivityAt: row.last_activity_at,
+            sizeBytes: row.size_bytes,
+            transcriptAvailable: row.transcript_path !== null,
+        }));
+        return { items, nextCursor, hasMore, total };
+    }
     getSession(sessionId) {
         const row = this.sqlite
             .prepare(`
-      SELECT id, epic_id, agent_id, tmux_session_id, status, started_at, ended_at, last_activity_at, activity_state, busy_since, transcript_path, claude_session_id, created_at, updated_at
+      SELECT id, epic_id, agent_id, tmux_session_id, status, started_at, ended_at, last_activity_at, activity_state, busy_since, transcript_path, created_at, updated_at
       FROM sessions
       WHERE id = ?
     `)
@@ -518,7 +884,6 @@ let SessionsService = class SessionsService {
             activityState: row.activity_state ?? null,
             busySince: row.busy_since ?? null,
             transcriptPath: row.transcript_path ?? null,
-            claudeSessionId: row.claude_session_id ?? null,
             createdAt: row.created_at,
             updatedAt: row.updated_at,
         };
@@ -526,7 +891,7 @@ let SessionsService = class SessionsService {
     async listActiveSessions(projectId, allowedAgentIds) {
         const rows = this.sqlite
             .prepare(`
-      SELECT id, epic_id, agent_id, tmux_session_id, status, started_at, ended_at, last_activity_at, activity_state, busy_since, transcript_path, claude_session_id, created_at, updated_at
+      SELECT id, epic_id, agent_id, tmux_session_id, status, started_at, ended_at, last_activity_at, activity_state, busy_since, transcript_path, created_at, updated_at
       FROM sessions
       WHERE status = 'running'
       ORDER BY started_at DESC
@@ -564,7 +929,6 @@ let SessionsService = class SessionsService {
             activityState: row.activity_state ?? null,
             busySince: row.busy_since ?? null,
             transcriptPath: row.transcript_path ?? null,
-            claudeSessionId: row.claude_session_id ?? null,
             createdAt: row.created_at,
             updatedAt: row.updated_at,
         }));
@@ -583,7 +947,7 @@ let SessionsService = class SessionsService {
             .prepare(`
         SELECT id, epic_id, agent_id, tmux_session_id, status,
                started_at, ended_at, last_activity_at, activity_state,
-               busy_since, transcript_path, claude_session_id,
+               busy_since, transcript_path,
                created_at, updated_at
         FROM sessions
         WHERE status = 'running' AND agent_id = ?
@@ -606,7 +970,6 @@ let SessionsService = class SessionsService {
             activityState: row.activity_state ?? null,
             busySince: row.busy_since ?? null,
             transcriptPath: row.transcript_path ?? null,
-            claudeSessionId: row.claude_session_id ?? null,
             createdAt: row.created_at,
             updatedAt: row.updated_at,
         };
@@ -616,7 +979,7 @@ let SessionsService = class SessionsService {
             .prepare(`
         SELECT s.id, s.epic_id, s.agent_id, s.tmux_session_id, s.status,
                s.started_at, s.ended_at, s.last_activity_at, s.activity_state,
-               s.busy_since, s.transcript_path, s.claude_session_id,
+               s.busy_since, s.transcript_path,
                s.created_at, s.updated_at
         FROM sessions s
         JOIN agents a ON s.agent_id = a.id
@@ -636,7 +999,6 @@ let SessionsService = class SessionsService {
             activityState: row.activity_state ?? null,
             busySince: row.busy_since ?? null,
             transcriptPath: row.transcript_path ?? null,
-            claudeSessionId: row.claude_session_id ?? null,
             createdAt: row.created_at,
             updatedAt: row.updated_at,
         }));