fix: harden stack restart migration

setup/restart-stack.test.ts

@@ -4,7 +4,10 @@ import path from 'path';
 
 import { afterEach, describe, expect, it, vi } from 'vitest';
 
-import { restartStackServices } from './restart-stack.js';
+import {
+  STACK_RESTART_UNIT_NAME,
+  restartStackServices,
+} from './restart-stack.js';
 
 describe('restartStackServices', () => {
   const tempRoots: string[] = [];
@@ -15,7 +18,7 @@ describe('restartStackServices', () => {
     }
   });
 
-  it('restarts and verifies the configured three-service stack', () => {
+  it('dispatches stack restart through the oneshot unit by default', () => {
     const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'ejclaw-restart-'));
     tempRoots.push(tempRoot);
     fs.writeFileSync(path.join(tempRoot, '.env.codex'), 'A=1\n');
@@ -27,6 +30,33 @@ describe('restartStackServices', () => {
       execFileSyncImpl,
       runningAsRoot: false,
       serviceManager: 'systemd',
+      serviceId: null,
+    });
+
+    expect(services).toEqual(['ejclaw', 'ejclaw-codex', 'ejclaw-review']);
+    expect(execFileSyncImpl).toHaveBeenNthCalledWith(
+      1,
+      'systemctl',
+      ['--user', 'start', '--wait', STACK_RESTART_UNIT_NAME],
+      { stdio: 'ignore' },
+    );
+    expect(execFileSyncImpl).toHaveBeenCalledTimes(1);
+  });
+
+  it('restarts and verifies the configured three-service stack in direct mode', () => {
+    const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'ejclaw-restart-'));
+    tempRoots.push(tempRoot);
+    fs.writeFileSync(path.join(tempRoot, '.env.codex'), 'A=1\n');
+    fs.writeFileSync(path.join(tempRoot, '.env.codex-review'), 'B=1\n');
+
+    const execFileSyncImpl = vi.fn();
+
+    const services = restartStackServices(tempRoot, {
+      direct: true,
+      execFileSyncImpl,
+      runningAsRoot: false,
+      serviceManager: 'systemd',
+      serviceId: null,
     });
 
     expect(services).toEqual(['ejclaw', 'ejclaw-codex', 'ejclaw-review']);
@@ -66,4 +96,89 @@ describe('restartStackServices', () => {
       }),
     ).toThrow('restart:stack only supports Linux systemd services in this repo');
   });
+
+  it('falls back to direct restart when the oneshot unit is not installed for an external caller', () => {
+    const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'ejclaw-restart-'));
+    tempRoots.push(tempRoot);
+    fs.writeFileSync(path.join(tempRoot, '.env.codex'), 'A=1\n');
+    fs.writeFileSync(path.join(tempRoot, '.env.codex-review'), 'B=1\n');
+
+    const execFileSyncImpl = vi
+      .fn()
+      .mockImplementationOnce(() => {
+        const error = new Error('unit missing');
+        Object.assign(error, {
+          stderr: 'Unit ejclaw-stack-restart.service not found.',
+        });
+        throw error;
+      });
+
+    const services = restartStackServices(tempRoot, {
+      execFileSyncImpl,
+      runningAsRoot: false,
+      serviceManager: 'systemd',
+      serviceId: null,
+    });
+
+    expect(services).toEqual(['ejclaw', 'ejclaw-codex', 'ejclaw-review']);
+    expect(execFileSyncImpl).toHaveBeenNthCalledWith(
+      1,
+      'systemctl',
+      ['--user', 'start', '--wait', STACK_RESTART_UNIT_NAME],
+      { stdio: 'ignore' },
+    );
+    expect(execFileSyncImpl).toHaveBeenNthCalledWith(
+      2,
+      'systemctl',
+      ['--user', 'restart', 'ejclaw', 'ejclaw-codex', 'ejclaw-review'],
+      { stdio: 'ignore' },
+    );
+  });
+
+  it('rejects direct fallback when the unit is missing for a managed service caller', () => {
+    const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'ejclaw-restart-'));
+    tempRoots.push(tempRoot);
+    fs.writeFileSync(path.join(tempRoot, '.env.codex'), 'A=1\n');
+
+    const execFileSyncImpl = vi.fn().mockImplementation(() => {
+      const error = new Error('unit missing');
+      Object.assign(error, {
+        stderr: 'Unit ejclaw-stack-restart.service not found.',
+      });
+      throw error;
+    });
+
+    expect(() =>
+      restartStackServices(tempRoot, {
+        execFileSyncImpl,
+        runningAsRoot: false,
+        serviceManager: 'systemd',
+        serviceId: 'codex-main',
+      }),
+    ).toThrow('Run `npm run setup -- --step service`');
+  });
+
+  it('does not hide a general start failure behind direct fallback', () => {
+    const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'ejclaw-restart-'));
+    tempRoots.push(tempRoot);
+    fs.writeFileSync(path.join(tempRoot, '.env.codex'), 'A=1\n');
+
+    const execFileSyncImpl = vi.fn().mockImplementation(() => {
+      const error = new Error('job failed');
+      Object.assign(error, {
+        stderr: 'Job for ejclaw-stack-restart.service failed because the control process exited with error code.',
+      });
+      throw error;
+    });
+
+    expect(() =>
+      restartStackServices(tempRoot, {
+        execFileSyncImpl,
+        runningAsRoot: false,
+        serviceManager: 'systemd',
+        serviceId: null,
+      }),
+    ).toThrow('job failed');
+    expect(execFileSyncImpl).toHaveBeenCalledTimes(1);
+  });
 });