agent-tower 0.7.4 → 0.7.5-beta.5

package/dist/services/__tests__/session-wakeup.service.test.js

@@ -0,0 +1,173 @@
+import { execFileSync } from 'node:child_process';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
+import { EventBus } from '../../core/event-bus.js';
+import { ServiceError } from '../../errors.js';
+const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'tower-wakeup-'));
+const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../..');
+process.env.AGENT_TOWER_DATABASE_URL = `file:${path.join(dir, 'test.db')}`;
+process.env.AGENT_TOWER_DATA_DIR = path.join(dir, 'data');
+let db;
+let SessionWakeupService;
+let buildWakeupMessage;
+function fakes() {
+    const submissions = [];
+    let activeTurn = false;
+    let queueFull = false;
+    const services = new Map();
+    const now = { value: new Date('2026-11-06T00:00:00Z') };
+    const eventBus = new EventBus();
+    const service = new SessionWakeupService({
+        eventBus,
+        sessions: { hasActiveTurn: () => activeTurn },
+        delivery: { submitSession: async (input) => {
+                if (queueFull)
+                    throw new ServiceError('full', 'DELIVERY_QUEUE_FULL', 429);
+                submissions.push(input);
+                return { operationId: `op-${submissions.length}` };
+            } },
+        services: {
+            findService: async (workspaceId, name) => services.get(`${workspaceId}:${name}`) ?? null,
+            readLogTail: async () => ['tail line 1', 'tail line 2'],
+        },
+        pollIntervalMs: 60_000,
+        maxPerSessionPerDay: 3,
+        now: () => now.value,
+    });
+    return { service, submissions, eventBus, services, now, setActiveTurn: (value) => { activeTurn = value; }, setQueueFull: (value) => { queueFull = value; } };
+}
+async function fixture() {
+    const project = await db.project.create({ data: { name: 'wakeup project', repoPath: dir } });
+    const task = await db.task.create({ data: { projectId: project.id, title: 'wakeup task' } });
+    const workspace = await db.workspace.create({ data: { taskId: task.id, branchName: 'wakeup', worktreePath: dir } });
+    const session = await db.session.create({ data: { workspaceId: workspace.id, agentType: 'CLAUDE_CODE', variant: 'DEFAULT', prompt: 'go', status: 'COMPLETED' } });
+    const serviceRow = await db.workspaceBackgroundService.create({ data: { workspaceId: workspace.id, name: 'route', command: 'python3', desiredState: 'RUNNING', runtimeState: 'RUNNING', runtimeInstanceId: 'rt-1', pid: 100 } });
+    return { project, task, workspace, session, serviceRow };
+}
+describe('SessionWakeupService', () => {
+    beforeAll(async () => {
+        execFileSync('pnpm', ['exec', 'prisma', 'db', 'push', '--skip-generate', '--schema=prisma/schema.prisma'], { cwd: root, env: process.env, stdio: 'pipe' });
+        db = (await import('../../utils/index.js')).prisma;
+        ({ SessionWakeupService, buildWakeupMessage } = await import('../session-wakeup.service.js'));
+    }, 120_000);
+    beforeEach(async () => {
+        await db.sessionWakeup.deleteMany();
+        await db.project.deleteMany();
+    });
+    afterEach(() => { vi.restoreAllMocks(); });
+    afterAll(async () => { await db.$disconnect(); fs.rmSync(dir, { recursive: true, force: true }); });
+    it('fires a timer wake-up once its time comes and delivers a system event to an idle session', async () => {
+        const { session } = await fixture();
+        const f = fakes();
+        await expect(f.service.scheduleTimer({ sessionId: session.id, delaySeconds: 5, reason: 'too soon' })).rejects.toMatchObject({ code: 'VALIDATION_ERROR' });
+        const wakeup = await f.service.scheduleTimer({ sessionId: session.id, delaySeconds: 600, reason: 'check the router' });
+        expect(wakeup).toMatchObject({ kind: 'TIMER', state: 'PENDING', fireAt: '2026-11-06T00:10:00.000Z' });
+        await f.service.pump();
+        expect(f.submissions).toHaveLength(0);
+        f.now.value = new Date('2026-11-06T00:10:01Z');
+        await f.service.pump();
+        expect(f.submissions).toHaveLength(1);
+        expect(f.submissions[0]).toMatchObject({ sessionId: session.id, systemEvent: true, clientSubmissionId: `wakeup:${wakeup.id}` });
+        expect(f.submissions[0].message).toContain('[SYSTEM NOTIFICATION - NOT USER INPUT]');
+        expect(f.submissions[0].message).toContain('kind="timer"');
+        expect(f.submissions[0].message).toContain('Reason: check the router');
+        const stored = await db.sessionWakeup.findUniqueOrThrow({ where: { id: wakeup.id } });
+        expect(stored).toMatchObject({ state: 'FIRED', deliveryId: 'op-1' });
+        await f.service.pump();
+        expect(f.submissions).toHaveLength(1);
+    });
+    it('waits for a workspace service exit, then delivers the exit code and log tail', async () => {
+        const { session, workspace, serviceRow } = await fixture();
+        const f = fakes();
+        f.services.set(`${workspace.id}:route`, { id: serviceRow.id, workspaceId: workspace.id, name: 'route', runtimeState: 'RUNNING', runtimeInstanceId: 'rt-1', exitCode: null });
+        await expect(f.service.waitForService({ sessionId: session.id, workspaceId: workspace.id, serviceName: 'missing' })).rejects.toMatchObject({ code: 'NOT_FOUND' });
+        const wakeup = await f.service.waitForService({ sessionId: session.id, workspaceId: workspace.id, serviceName: 'route', reason: 'routing' });
+        expect(wakeup).toMatchObject({ kind: 'SERVICE_EXIT', state: 'PENDING', serviceName: 'route' });
+        // Asking twice for the same service returns the same pending wake-up.
+        expect((await f.service.waitForService({ sessionId: session.id, workspaceId: workspace.id, serviceName: 'route' })).id).toBe(wakeup.id);
+        await f.service.pump();
+        expect(f.submissions).toHaveLength(0);
+        await f.service.handleServiceExit({ serviceId: serviceRow.id, workspaceId: workspace.id, name: 'route', exitCode: 0, runtimeState: 'EXITED', stopped: false, logTail: ['routed 115 nets', 'done'] });
+        await f.service.pump();
+        expect(f.submissions).toHaveLength(1);
+        const message = f.submissions[0].message;
+        expect(message).toContain('kind="service_exit" service="route" exit_code="0" runtime_state="EXITED"');
+        expect(message).toContain('Reason you gave for waiting: routing');
+        expect(message).toContain('routed 115 nets\ndone');
+        expect((await db.sessionWakeup.findUniqueOrThrow({ where: { id: wakeup.id } })).state).toBe('FIRED');
+    });
+    it('delivers immediately when the service already exited', async () => {
+        const { session, workspace, serviceRow } = await fixture();
+        const f = fakes();
+        f.services.set(`${workspace.id}:route`, { id: serviceRow.id, workspaceId: workspace.id, name: 'route', runtimeState: 'FAILED', runtimeInstanceId: null, exitCode: 2 });
+        const wakeup = await f.service.waitForService({ sessionId: session.id, workspaceId: workspace.id, serviceName: 'route' });
+        expect(wakeup.state).toBe('READY');
+        await f.service.pump();
+        expect(f.submissions).toHaveLength(1);
+        expect(f.submissions[0].message).toContain('exit_code="2" runtime_state="FAILED"');
+        expect(f.submissions[0].message).toContain('tail line 1');
+    });
+    it('defers while a turn is running, drops for stopped sessions, and enforces the daily cap', async () => {
+        const { session } = await fixture();
+        const f = fakes();
+        const first = await f.service.scheduleTimer({ sessionId: session.id, delaySeconds: 60, reason: 'one' });
+        f.now.value = new Date('2026-11-06T00:02:00Z');
+        f.setActiveTurn(true);
+        await f.service.pump();
+        expect(f.submissions).toHaveLength(0);
+        expect((await db.sessionWakeup.findUniqueOrThrow({ where: { id: first.id } })).state).toBe('READY');
+        f.setActiveTurn(false);
+        f.setQueueFull(true);
+        await f.service.pump();
+        expect((await db.sessionWakeup.findUniqueOrThrow({ where: { id: first.id } })).state).toBe('READY');
+        f.setQueueFull(false);
+        await f.service.pump();
+        expect(f.submissions).toHaveLength(1);
+        for (const reason of ['two', 'three']) {
+            await f.service.scheduleTimer({ sessionId: session.id, delaySeconds: 60, reason });
+            f.now.value = new Date(f.now.value.getTime() + 61_000);
+            await f.service.pump();
+        }
+        expect(f.submissions).toHaveLength(3);
+        await expect(f.service.scheduleTimer({ sessionId: session.id, delaySeconds: 60, reason: 'four' })).rejects.toMatchObject({ code: 'WAKEUP_CAP_EXCEEDED' });
+        await db.session.update({ where: { id: session.id }, data: { status: 'CANCELLED' } });
+        await db.sessionWakeup.create({ data: { sessionId: session.id, kind: 'TIMER', reason: 'late', fireAt: new Date(0), state: 'PENDING' } });
+        await f.service.pump();
+        expect(f.submissions).toHaveLength(3);
+        expect(await db.sessionWakeup.count({ where: { sessionId: session.id, state: 'CANCELLED', lastError: 'SESSION_STOPPED' } })).toBe(1);
+    });
+    it('cancels pending wake-ups when the session is stopped and limits pending ones', async () => {
+        const { session } = await fixture();
+        const f = fakes();
+        f.service.start();
+        try {
+            for (let index = 0; index < 8; index += 1)
+                await f.service.scheduleTimer({ sessionId: session.id, delaySeconds: 3600, reason: `r${index}` });
+            await expect(f.service.scheduleTimer({ sessionId: session.id, delaySeconds: 3600, reason: 'overflow' })).rejects.toMatchObject({ code: 'WAKEUP_LIMIT' });
+            f.eventBus.emit('session:stopped', { sessionId: session.id });
+            await vi.waitFor(async () => {
+                expect(await db.sessionWakeup.count({ where: { sessionId: session.id, state: 'CANCELLED' } })).toBe(8);
+            });
+        }
+        finally {
+            f.service.stop();
+        }
+    });
+    it('rejects wake-ups for conversation sessions and unknown sessions', async () => {
+        const f = fakes();
+        await expect(f.service.scheduleTimer({ sessionId: 'missing', delaySeconds: 60, reason: 'x' })).rejects.toMatchObject({ code: 'NOT_FOUND' });
+        // A session without a workspace (standalone conversation) cannot be woken.
+        const session = await db.session.create({ data: { context: 'CONVERSATION', agentType: 'CLAUDE_CODE', variant: 'DEFAULT', prompt: 'hi', status: 'COMPLETED' } });
+        await expect(f.service.scheduleTimer({ sessionId: session.id, delaySeconds: 60, reason: 'x' })).rejects.toMatchObject({ code: 'WAKEUP_UNAVAILABLE' });
+    });
+    it('builds messages that never read as user input', () => {
+        const text = buildWakeupMessage({ kind: 'SERVICE_EXIT', reason: '', serviceName: 'a"b', fireAt: null, createdAt: new Date(), payload: JSON.stringify({ exitCode: 1, runtimeState: 'FAILED', logTail: ['x'] }) });
+        expect(text.startsWith('[SYSTEM NOTIFICATION - NOT USER INPUT]')).toBe(true);
+        expect(text).toContain('service="a&quot;b"');
+        expect(text).toContain('Workspace service "a"b" exited with code 1.');
+    });
+});
+//# sourceMappingURL=session-wakeup.service.test.js.map

package/dist/services/__tests__/session-wakeup.service.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-wakeup.service.test.js","sourceRoot":"","sources":["../../../src/services/__tests__/session-wakeup.service.test.ts"],"names":[],"mappings":"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"}

package/dist/services/__tests__/terminal-manager.test.js

@@ -1,6 +1,17 @@
+import fs from 'node:fs';
 import { describe, expect, it, vi } from 'vitest';
 import { EventBus } from '../../core/event-bus.js';
 import { TerminalManager } from '../terminal-manager.js';
+import { resolveScopeHelper } from '../../runtime/process-scope/scope-helper.js';
+function fakeScope(overrides = {}) {
+    return {
+        helper: { path: '/fake/agent-tower-scope', capabilities: { subreaper: true, pidfd: true, childrenFile: true } },
+        buildInvocation: (policy, command, args) => ({ command: '/fake/agent-tower-scope', args: ['--id', policy.id, '--grace', String(policy.graceMs), '--', command, ...args] }),
+        requestStop: vi.fn(() => true),
+        forceStop: vi.fn(() => true),
+        ...overrides,
+    };
+}
 vi.mock('../../utils/error-log.js', () => ({ writeErrorLog: vi.fn() }));
 class FakePty {
     pid = 4242;
@@ -39,7 +50,7 @@ describe('TerminalManager process ownership', () => {
         };
         const manager = new TerminalManager(new EventBus(), {
             spawn: vi.fn(() => shell), unixProcessAdapter: adapter,
-            platform: 'linux', gracefulTimeoutMs: 0, forceTimeoutMs: 30,
+            platform: 'linux', gracefulTimeoutMs: 0, forceTimeoutMs: 30, processScope: null,
         });
         const terminal = manager.create('socket');
         try {
@@ -55,6 +66,56 @@ describe('TerminalManager process ownership', () => {
             await manager.destroyAll();
         }
     });
+    it('runs a supervised terminal under the scope helper and stops it through the supervisor', async () => {
+        const shell = new FakePty();
+        const scope = fakeScope({ requestStop: vi.fn(() => { shell.exit(); return true; }) });
+        const spawn = vi.fn(() => shell);
+        const adapter = { captureOwnedGroups: vi.fn(), captureDescendantGroups: vi.fn() };
+        const manager = new TerminalManager(new EventBus(), {
+            spawn: spawn, unixProcessAdapter: adapter, processScope: scope, platform: 'linux',
+            shell: { command: '/bin/sh', args: ['-l'] }, gracefulTimeoutMs: 10, forceTimeoutMs: 20,
+        });
+        const terminal = manager.create('socket');
+        try {
+            const [command, args, options] = spawn.mock.calls[0];
+            expect(command).toBe('/fake/agent-tower-scope');
+            expect(args).toEqual(['--id', terminal.terminalId, '--grace', '10', '--', '/bin/sh', '-l']);
+            expect(options.env.AGENT_TOWER_PROCESS_IDENTITY).toBeUndefined();
+            await manager.destroy(terminal.terminalId);
+            expect(scope.requestStop).toHaveBeenCalledWith(shell.pid, 'SIGHUP');
+            expect(scope.forceStop).not.toHaveBeenCalled();
+            expect(adapter.captureOwnedGroups).not.toHaveBeenCalled();
+            expect(adapter.captureDescendantGroups).not.toHaveBeenCalled();
+            expect(manager.size).toBe(0);
+        }
+        finally {
+            shell.exit();
+            await manager.destroyAll();
+        }
+    });
+    it('escalates a lingering supervised terminal and keeps it retryable when it never exits', async () => {
+        const shell = new FakePty();
+        let exitOnForce = false;
+        const scope = fakeScope({ forceStop: vi.fn(() => { if (exitOnForce)
+                shell.exit(); return true; }) });
+        const manager = new TerminalManager(new EventBus(), {
+            spawn: vi.fn(() => shell), processScope: scope, platform: 'linux', gracefulTimeoutMs: 5, forceTimeoutMs: 10,
+        });
+        const terminal = manager.create('socket');
+        try {
+            await expect(manager.destroy(terminal.terminalId)).rejects.toThrow('process tree did not exit');
+            expect(scope.requestStop).toHaveBeenCalledWith(shell.pid, 'SIGHUP');
+            expect(scope.forceStop).toHaveBeenCalledWith(shell.pid);
+            expect(manager.has(terminal.terminalId)).toBe(true);
+            exitOnForce = true;
+            await manager.cleanupBySocket('socket');
+            expect(manager.size).toBe(0);
+        }
+        finally {
+            shell.exit();
+            await manager.destroyAll();
+        }
+    });
     it('reclaims verified Windows descendants after the terminal root exits', async () => {
         const shell = new FakePty();
         let rootAlive = true;
@@ -188,58 +249,75 @@ describe('TerminalManager process ownership', () => {
             await manager.destroyAll();
         }
     });
-    it.skipIf(process.platform === 'win32').each(['foreground', 'background', 'markerless-background'])('reclaims a real %s child that ignores SIGHUP', async (mode) => {
-        const bus = new EventBus();
-        const manager = new TerminalManager(bus, {
-            shell: { command: '/bin/sh', args: [] }, gracefulTimeoutMs: 100,
-        });
-        const terminal = manager.create('real-terminal-test', { cwd: '/tmp' });
-        let childPid = 0;
-        let output = '';
-        bus.on('terminal:stdout', event => {
-            output += event.data;
-            const match = /TERMINAL_TEST_CHILD=(\d+)/.exec(output);
-            if (match)
-                childPid = Number(match[1]);
-        });
-        const quote = (value) => "'" + value.replaceAll("'", "'\\''") + "'";
-        const alive = (pid) => { try {
-            process.kill(pid, 0);
-            return true;
-        }
-        catch {
-            return false;
-        } };
-        try {
-            manager.write(terminal.terminalId, `${mode === 'markerless-background' ? 'env -i ' : ''}${quote(process.execPath)} -e ${quote("process.on('SIGHUP',()=>{});console.log('TERMINAL_TEST_CHILD='+process.pid);setInterval(()=>{},1000)")} ${mode !== 'foreground' ? '&' : ''}\r`);
-            await expect.poll(() => childPid, { timeout: 5000 }).toBeGreaterThan(0);
-            if (mode !== 'foreground') {
-                if (mode === 'markerless-background') {
-                    // Establish ancestry while the shell is alive; after exit the job
-                    // has neither its launch token nor a live parent to discover it by.
-                    await new Promise((resolve) => setTimeout(resolve, 500));
-                }
-                manager.write(terminal.terminalId, 'exit\r');
-                await expect.poll(() => manager.size, { timeout: 4000 }).toBe(0);
-            }
-            else {
-                await Promise.all([manager.destroy(terminal.terminalId), manager.cleanupBySocket('real-terminal-test')]);
+    const realBackends = [
+        { backend: 'supervised', options: {}, enabled: process.platform === 'linux' && resolveScopeHelper() !== null },
+        { backend: 'compat', options: { processScope: null }, enabled: process.platform !== 'win32' },
+    ];
+    for (const { backend, options, enabled } of realBackends) {
+        it.skipIf(!enabled).each(['foreground', 'background', 'markerless-background'])(`reclaims a real %s child that ignores SIGHUP (${backend})`, async (mode) => {
+            const bus = new EventBus();
+            const manager = new TerminalManager(bus, {
+                shell: { command: '/bin/sh', args: [] }, gracefulTimeoutMs: 100, ...options,
+            });
+            const terminal = manager.create('real-terminal-test', { cwd: '/tmp' });
+            let childPid = 0;
+            let output = '';
+            bus.on('terminal:stdout', event => {
+                output += event.data;
+                const match = /TERMINAL_TEST_CHILD=(\d+)/.exec(output);
+                if (match)
+                    childPid = Number(match[1]);
+            });
+            const quote = (value) => "'" + value.replaceAll("'", "'\\''") + "'";
+            const alive = (pid) => { try {
+                process.kill(pid, 0);
+                return true;
             }
-            expect(manager.size).toBe(0);
-            await expect.poll(() => alive(childPid)).toBe(false);
-            await manager.destroyAll();
-            expect(() => manager.create('after-shutdown')).toThrow('stopped');
-        }
-        finally {
-            for (const pid of [childPid, terminal.pid])
-                if (pid && alive(pid)) {
-                    try {
-                        process.kill(pid, 'SIGKILL');
+            catch {
+                return false;
+            } };
+            try {
+                if (backend === 'supervised') {
+                    // The PTY root is the supervisor, not the shell. Poll: right after
+                    // spawn the child may not have exec'd the supervisor yet.
+                    const rootCommand = () => { try {
+                        return fs.readFileSync(`/proc/${terminal.pid}/cmdline`, 'utf8').split('\0')[0];
                     }
-                    catch { }
+                    catch {
+                        return '';
+                    } };
+                    await expect.poll(rootCommand, { timeout: 5000 }).toBe(resolveScopeHelper().path);
                 }
-            await manager.destroyAll();
-        }
-    }, 10000);
+                manager.write(terminal.terminalId, `${mode === 'markerless-background' ? 'env -i ' : ''}${quote(process.execPath)} -e ${quote("process.on('SIGHUP',()=>{});console.log('TERMINAL_TEST_CHILD='+process.pid);setInterval(()=>{},1000)")} ${mode !== 'foreground' ? '&' : ''}\r`);
+                await expect.poll(() => childPid, { timeout: 5000 }).toBeGreaterThan(0);
+                if (mode !== 'foreground') {
+                    if (mode === 'markerless-background' && backend === 'compat') {
+                        // Establish ancestry while the shell is alive; after exit the job
+                        // has neither its launch token nor a live parent to discover it by.
+                        await new Promise((resolve) => setTimeout(resolve, 500));
+                    }
+                    manager.write(terminal.terminalId, 'exit\r');
+                    await expect.poll(() => manager.size, { timeout: 4000 }).toBe(0);
+                }
+                else {
+                    await Promise.all([manager.destroy(terminal.terminalId), manager.cleanupBySocket('real-terminal-test')]);
+                }
+                expect(manager.size).toBe(0);
+                await expect.poll(() => alive(childPid)).toBe(false);
+                await manager.destroyAll();
+                expect(() => manager.create('after-shutdown')).toThrow('stopped');
+            }
+            finally {
+                for (const pid of [childPid, terminal.pid])
+                    if (pid && alive(pid)) {
+                        try {
+                            process.kill(pid, 'SIGKILL');
+                        }
+                        catch { }
+                    }
+                await manager.destroyAll();
+            }
+        }, 10000);
+    }
 });
 //# sourceMappingURL=terminal-manager.test.js.map

package/dist/services/__tests__/terminal-manager.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-manager.test.js","sourceRoot":"","sources":["../../../src/services/__tests__/terminal-manager.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminal-manager.test.js","sourceRoot":"","sources":["../../../src/services/__tests__/terminal-manager.test.ts"],"names":[],"mappings":"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"}

package/dist/services/__tests__/workspace.service.test.js

@@ -381,6 +381,37 @@ describe('WorkspaceService TeamRun workspace lifecycle', () => {
         await expect(service.merge(workspace.id)).rejects.toMatchObject({ code: 'PARENT_WORKSPACE_HAS_ACTIVE_SESSION' });
         expect(mergeWorktreeMock).not.toHaveBeenCalled();
     });
+    it.each([undefined, true])('keeps target background services running when merging with stopActiveServices=%s', async (stopActiveServices) => {
+        const { project, task: parent } = await createTask('Parent with background services');
+        const parentWorkspace = await prisma.workspace.create({ data: {
+                taskId: parent.id, branchName: 'at/parent', baseBranch: 'main', worktreePath: '/parent',
+            } });
+        const child = await prisma.task.create({ data: {
+                projectId: project.id, title: 'Child', parentTaskId: parent.id, status: 'IN_REVIEW',
+            } });
+        const childWorkspace = await prisma.workspace.create({ data: {
+                taskId: child.id, branchName: 'at/child', baseBranch: 'at/parent', worktreePath: '/child',
+            } });
+        const background = await prisma.workspaceBackgroundService.create({ data: {
+                workspaceId: parentWorkspace.id,
+                name: 'web',
+                command: 'node',
+                desiredState: 'RUNNING',
+                runtimeState: 'RUNNING',
+                runtimeInstanceId: 'runtime-parent-web',
+                pid: 4321,
+            } });
+        const stopAllForWorkspace = vi.fn().mockRejectedValue(new Error('target service must not be stopped'));
+        const lifecycleService = new WorkspaceService(new TeamLockService(), { stopAllForWorkspace });
+        await expect(lifecycleService.merge(childWorkspace.id, { stopActiveServices }))
+            .resolves.toBe('root-merge-sha');
+        expect(mergeWorktreeMock).toHaveBeenCalledWith('/child', 'at/parent', expect.objectContaining({ targetWorktreePath: '/parent' }));
+        expect(stopAllForWorkspace).not.toHaveBeenCalled();
+        await expect(prisma.workspaceBackgroundService.findUnique({ where: { id: background.id } }))
+            .resolves.toEqual(background);
+        await expect(prisma.workspace.findUnique({ where: { id: parentWorkspace.id } }))
+            .resolves.toMatchObject({ status: 'ACTIVE' });
+    });
     it('retains a merged parent branch and its ownership until its subtasks no longer depend on it', async () => {
         const { project, task: parent } = await createTask('Retain parent branch');
         await prisma.task.update({ where: { id: parent.id }, data: { status: 'DONE' } });