@aeolus-fleet/trierarch 0.32.2 → 0.33.0

package/dist/adapters/hold.js

@@ -0,0 +1,310 @@
+import { spawn } from 'node:child_process';
+import { createWriteStream } from 'node:fs';
+import { mkdir, rm, writeFile } from 'node:fs/promises';
+import { createServer } from 'node:net';
+import { createInterface } from 'node:readline';
+import { codexThreadStartedSchema, codexTurnCommand } from './codex.js';
+import { holdRequestSchema, parsedLine, REFUSED } from './hold-protocol.js';
+/**
+ * The hold (headless H8 to H12): a small process per session, started outside
+ * the trierarch's service so it outlives it, the only holder of its harness's
+ * stdin and stdout. It starts the harness as its child, appends every line the
+ * harness writes to the session's events, keeps the harness's session id, and
+ * answers the trierarch alone on its socket: send a line, interrupt the turn,
+ * say its state. When the harness ends, the hold ends; when the hold is
+ * stopped, the harness ends with it. A hold that dies without the chance to
+ * stop it, as SIGKILL leaves it, still ends its harness: a guard, a process of
+ * its own, holds a pipe from the hold and ends each harness's group once that
+ * pipe closes, which the hold's death does.
+ *
+ * Claude Code's turn is stopped with the interrupt control request on its
+ * stdin, which keeps the process (H12, Thomas, 25 Oct: "Headless option 2").
+ * When Claude Code refuses it, SIGINT stops the turn and the process, and the
+ * hold starts it again resuming its session, so the trierarch sees no exit.
+ *
+ * Codex runs one `codex exec` per turn (H11): the start command is the first
+ * turn, and each line sent is the prompt of a `codex exec resume` of the
+ * thread the first named, started once the last turn's process has ended.
+ * Between turns no Codex process runs and the hold stays; its turn is stopped
+ * with SIGINT, which ends the process (H12).
+ */
+/** The longest the hold waits for an interrupted turn to end before the forced line goes in anyway (timings-and-limits.md). */
+export const INTERRUPT_WAIT_MS = 10_000;
+/** The flag that resumes a Claude Code session by its id, and the one that continues the folder's last, which a resume replaces. */
+const RESUME = '--resume';
+const CONTINUE = '--continue';
+/** How long the guard gives a harness's group to end after SIGTERM before SIGKILL. */
+const GUARD_GRACE_MS = 2_000;
+/**
+ * The guard, run by Node: each stdin line is the group of a harness the hold
+ * started; when stdin closes, every such group is ended. It is plain
+ * JavaScript so it needs nothing the hold was started with.
+ */
+const GUARD = `
+const groups = new Set();
+const end = (signal) => {
+  for (const group of groups) {
+    try { process.kill(-group, signal); } catch {}
+  }
+};
+const lines = require('node:readline').createInterface({ input: process.stdin });
+lines.on('line', (line) => { groups.add(Number(line)); });
+lines.on('close', () => {
+  end('SIGTERM');
+  setTimeout(() => { end('SIGKILL'); }, ${String(GUARD_GRACE_MS)});
+});
+`;
+/** The session id a Claude Code event names, when it names one. */
+function sessionIdOf(event) {
+    const id = Reflect.get(event, 'session_id');
+    return typeof id === 'string' ? id : undefined;
+}
+/** Runs the hold until its harness ends; answers the harness's exit code. */
+export async function runHold(options) {
+    const { files, folder, harness, environment, version } = options;
+    await mkdir(files.folder, { recursive: true, mode: 0o700 });
+    await rm(files.socket, { force: true });
+    await writeFile(files.pid, String(process.pid));
+    const events = createWriteStream(files.events, { flags: 'a', mode: 0o600 });
+    let sessionId;
+    let isBusy = false;
+    let isRestarting = false;
+    let isStopping = false;
+    const isCodex = harness === 'codex';
+    let controls = 0;
+    const waiters = new Set();
+    const tell = (event) => {
+        for (const waiter of [...waiters]) {
+            waiter(event);
+        }
+    };
+    let resolveEnd = () => undefined;
+    const ended = new Promise((resolve) => {
+        resolveEnd = resolve;
+    });
+    // A line is acted on once it is written, so whoever a result or a control response answers finds it in the events.
+    const onLine = (line) => {
+        events.write(`${line}\n`, () => {
+            onWritten(line);
+        });
+    };
+    const onWritten = (line) => {
+        const event = parsedLine(line);
+        if (typeof event !== 'object' || event === null) {
+            return;
+        }
+        const type = Reflect.get(event, 'type');
+        const id = isCodex ? codexThreadStartedSchema.safeParse(event).data?.thread_id : sessionIdOf(event);
+        if (id !== undefined && id !== sessionId) {
+            sessionId = id;
+            void writeFile(files.sessionId, id);
+        }
+        if (type === 'result') {
+            isBusy = false;
+            tell({ type: 'result' });
+        }
+        const response = type === 'control_response' ? Reflect.get(event, 'response') : undefined;
+        if (typeof response === 'object' && response !== null) {
+            const requestId = Reflect.get(response, 'request_id');
+            tell({ type: 'control', requestId: typeof requestId === 'string' ? requestId : '', isRefused: Reflect.get(response, 'subtype') === 'error' });
+        }
+    };
+    // A session of its own, so a signal to the hold's group does not end the guard before it ends the harness.
+    const guard = spawn(process.execPath, ['-e', GUARD], { env: {}, stdio: ['pipe', 'ignore', 'ignore'], detached: true });
+    guard.stdin.on('error', () => undefined);
+    guard.unref();
+    /** Kills the harness's process group: the harness and every process it started. */
+    const killGroup = (running) => {
+        try {
+            process.kill(-(running.pid ?? 0), 'SIGKILL');
+        }
+        catch {
+            // Its group is gone already.
+        }
+    };
+    const startHarness = (command) => {
+        const [program = '', ...args] = command;
+        // A process group of its own: a stop ends the harness and every process it started.
+        const started = spawn(program, args, { cwd: folder, env: { ...environment }, stdio: ['pipe', 'pipe', 'ignore'], detached: true });
+        if (started.pid !== undefined) {
+            guard.stdin.write(`${String(started.pid)}\n`);
+        }
+        started.stdin.on('error', () => undefined);
+        // codex exec reads a stdin that is no terminal to its end before its turn: it gets none.
+        if (isCodex) {
+            started.stdin.end();
+        }
+        createInterface({ input: started.stdout }).on('line', onLine);
+        started.on('error', () => {
+            resolveEnd(1);
+        });
+        started.on('exit', (code) => {
+            if (isCodex && child === started) {
+                isBusy = false;
+                child = undefined;
+            }
+            tell({ type: 'exit' });
+            if (isStopping || (!isRestarting && !isCodex)) {
+                resolveEnd(code ?? 1);
+            }
+        });
+        return started;
+    };
+    let child = startHarness(options.command);
+    if (isCodex) {
+        isBusy = true;
+    }
+    /** Waits until the waiter is told what it waits for, or the time is up. */
+    const waitFor = (isIt, ms) => new Promise((resolve) => {
+        const waiter = (event) => {
+            if (isIt(event)) {
+                finish(event);
+            }
+        };
+        const timer = setTimeout(() => {
+            finish(undefined);
+        }, ms);
+        const finish = (event) => {
+            clearTimeout(timer);
+            waiters.delete(waiter);
+            resolve(event);
+        };
+        waiters.add(waiter);
+    });
+    /** Claude Code started again, resuming its session, after SIGINT ended it (H12). */
+    const resumed = () => {
+        const [program = '', ...flags] = options.command.filter((word) => word !== CONTINUE);
+        return sessionId === undefined ? [program, ...flags, CONTINUE] : [program, ...flags, RESUME, sessionId];
+    };
+    /** Ends Codex's running turn: SIGINT, then its process group killed when it has not ended within the wait (H12). */
+    const endCodexTurn = async (signal) => {
+        const running = child;
+        if (running === undefined) {
+            return;
+        }
+        const exited = waitFor((event) => event.type === 'exit', INTERRUPT_WAIT_MS);
+        if (signal === 'SIGINT') {
+            running.kill('SIGINT');
+        }
+        else {
+            killGroup(running);
+        }
+        if ((await exited) === undefined && child === running) {
+            killGroup(running);
+            await waitFor((event) => event.type === 'exit', INTERRUPT_WAIT_MS);
+        }
+    };
+    /** Codex's next turn, once the last turn's process has ended: a codex exec resume of the session's thread (H11). */
+    const startCodexTurn = async (line) => {
+        if (sessionId === undefined) {
+            return { isOk: false, error: 'Codex named no thread to resume yet' };
+        }
+        if (child !== undefined) {
+            const running = child;
+            if ((await waitFor((event) => event.type === 'exit', INTERRUPT_WAIT_MS)) === undefined && child === running) {
+                await endCodexTurn('SIGKILL');
+            }
+        }
+        isBusy = true;
+        child = startHarness(codexTurnCommand({ start: options.command, threadId: sessionId, line }));
+        return { isOk: true };
+    };
+    /** The lines in the order they came: one waits for the one before, so two never start a codex exec resume on one thread. */
+    let lastCodexSend = Promise.resolve();
+    const sendCodex = (line) => {
+        const sent = lastCodexSend.then(() => startCodexTurn(line));
+        // A failed send must not hold back the lines after it.
+        lastCodexSend = sent.catch(() => undefined);
+        return sent;
+    };
+    const interrupt = async () => {
+        if (!isBusy) {
+            return;
+        }
+        if (isCodex) {
+            await endCodexTurn('SIGINT');
+            return;
+        }
+        const current = child;
+        if (current === undefined) {
+            return;
+        }
+        const until = Date.now() + INTERRUPT_WAIT_MS;
+        if (harness === 'claude-code') {
+            controls += 1;
+            const requestId = `aeolus-interrupt-${String(controls)}`;
+            const turnEnd = waitFor((event) => event.type === 'result' || event.type === 'exit', INTERRUPT_WAIT_MS);
+            const answer = waitFor((event) => event.type === 'control' && event.requestId === requestId, INTERRUPT_WAIT_MS);
+            current.stdin.write(`${JSON.stringify({ type: 'control_request', request_id: requestId, request: { subtype: 'interrupt' } })}\n`);
+            const answered = await Promise.race([answer, turnEnd]);
+            if (answered?.type !== 'control' || !answered.isRefused) {
+                await turnEnd;
+                return;
+            }
+        }
+        // SIGINT ends the turn, and Claude Code's process with it: started again resuming its session, no exit for the trierarch to see.
+        isRestarting = harness === 'claude-code';
+        const exited = waitFor((event) => event.type === 'exit', Math.max(0, until - Date.now()));
+        current.kill('SIGINT');
+        await exited;
+        if (isRestarting) {
+            isBusy = false;
+            child = startHarness(resumed());
+            isRestarting = false;
+        }
+    };
+    const answer = async (request) => {
+        switch (request.call) {
+            case 'send':
+                if (isCodex) {
+                    return sendCodex(request.line);
+                }
+                isBusy = true;
+                child?.stdin.write(`${request.line}\n`);
+                return { isOk: true };
+            case 'interrupt':
+                await interrupt();
+                return { isOk: true };
+            case 'state':
+                return { isOk: true, state: { status: 'running', version, ...(sessionId !== undefined && { sessionId }) } };
+        }
+    };
+    const server = createServer((connection) => {
+        connection.on('error', () => undefined);
+        void (async () => {
+            if (!(await options.mayCall(connection))) {
+                connection.end(`${JSON.stringify({ isOk: false, error: REFUSED })}\n`);
+                return;
+            }
+            const lines = createInterface({ input: connection });
+            for await (const line of lines) {
+                const request = holdRequestSchema.safeParse(parsedLine(line));
+                const answered = request.success ? await answer(request.data) : { isOk: false, error: 'not a hold call' };
+                connection.end(`${JSON.stringify(answered)}\n`);
+                return;
+            }
+        })();
+    });
+    await new Promise((resolve) => server.listen(files.socket, resolve));
+    const stop = () => {
+        isStopping = true;
+        if (child === undefined) {
+            resolveEnd(0);
+            return;
+        }
+        try {
+            process.kill(-(child.pid ?? 0), 'SIGTERM');
+        }
+        catch {
+            // Its group is gone already.
+        }
+    };
+    process.once('SIGTERM', stop);
+    process.once('SIGHUP', stop);
+    const code = await ended;
+    server.close();
+    await rm(files.socket, { force: true });
+    await new Promise((resolve) => events.end(resolve));
+    return code;
+}
+//# sourceMappingURL=hold.js.map

package/dist/adapters/hold.js.map

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

package/dist/adapters/paths.d.ts

@@ -20,6 +20,8 @@ export interface TrierarchPaths {
     readonly worktrees: string;
     /** The homes of the ships whose sessions run in containers, one folder per ship (decision 0039). */
     readonly homes: string;
+    /** Each session's hold files, in a folder of its own (headless H8). */
+    readonly sessions: string;
     /** Each crewed ship's socket, in a folder of its own: its session's fleet calls come over it (decision 0026). */
     readonly sockets: string;
     /** Each crewed ship's read-only checkouts, in a folder of its own (#1182). */

package/dist/adapters/paths.js

@@ -13,6 +13,7 @@ export function trierarchPaths(at) {
         logs: join(home, 'logs'),
         worktrees: join(home, 'worktrees'),
         homes: join(home, 'homes'),
+        sessions: join(home, 'sessions'),
         sockets: join(home, 'sockets'),
         checkouts: join(home, 'checkouts'),
         trustedRepositories: join(home, 'trusted-repositories.json'),

package/dist/adapters/paths.js.map

@@ -1 +1 @@
-{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../src/adapters/paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAmCjC,MAAM,UAAU,cAAc,CAAC,EAA8C;IAC3E,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5D,OAAO;QACL,IAAI;QACJ,MAAM,EAAE,EAAE,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC;QAC9C,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,oBAAoB,CAAC;QAC9C,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC;QACnC,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC;QACrC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC;QAC/B,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC;QACrC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC;QACnC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC;QACxB,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC;QAClC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC;QAC1B,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC;QAC9B,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC;QAClC,mBAAmB,EAAE,IAAI,CAAC,IAAI,EAAE,2BAA2B,CAAC;QAC5D,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC;KACzC,CAAC;AACJ,CAAC;AAED,0FAA0F;AAC1F,MAAM,UAAU,QAAQ,CAAC,KAAa,EAAE,MAAc;IACpD,OAAO,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../src/adapters/paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAqCjC,MAAM,UAAU,cAAc,CAAC,EAA8C;IAC3E,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5D,OAAO;QACL,IAAI;QACJ,MAAM,EAAE,EAAE,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC;QAC9C,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,oBAAoB,CAAC;QAC9C,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC;QACnC,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC;QACrC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC;QAC/B,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC;QACrC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC;QACnC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC;QACxB,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC;QAClC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC;QAC1B,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC;QAChC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC;QAC9B,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC;QAClC,mBAAmB,EAAE,IAAI,CAAC,IAAI,EAAE,2BAA2B,CAAC;QAC5D,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC;KACzC,CAAC;AACJ,CAAC;AAED,0FAA0F;AAC1F,MAAM,UAAU,QAAQ,CAAC,KAAa,EAAE,MAAc;IACpD,OAAO,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC"}

package/dist/adapters/runtime-adapters.d.ts

@@ -3,6 +3,17 @@ import type { SessionRuntime, WorkspacePort } from '../core/ports.js';
 import type { SessionRoots } from './caller-check.js';
 import type { TrustedClones } from './trusted-clones.js';
 import type { TrierarchPaths } from './paths.js';
+/**
+ * The sessions on the host (headless H4, H8): one hold per ship, with the
+ * sessions an older trierarch started in tmux listed beside them until each
+ * is replaced (H19).
+ */
+export declare function hostSessions(at: {
+    paths: TrierarchPaths;
+    version: string;
+    launch?: readonly string[];
+    program?: readonly string[];
+}): SessionRuntime & SessionRoots;
 /** What runs the sessions, where their workspaces go, and, in containers, where each ship's home is kept. */
 export interface RuntimeAdapters {
     readonly sessions: SessionRuntime & SessionRoots;
@@ -15,7 +26,7 @@ export interface RuntimeAdapters {
 }
 /**
  * The adapters the configuration's session runtime picks (decision 0039): on
- * the host, tmux and a worktree per ship; in containers, a container per ship
+ * the host, a hold per ship and a worktree per ship (headless H4); in containers, a container per ship
  * from the image of the trierarch's own version, with the configured binary
  * and caps and the machine's model token, a clone per ship in place of the
  * worktree, by its real path, and a home of each ship's own.
@@ -28,4 +39,6 @@ export declare function runtimeAdaptersOf(at: {
     managedSettings: string;
     /** The trusted repositories a workspace clones first when the machine does not have them (aeolus-fleet#384). */
     clones?: TrustedClones;
+    /** The trierarch program that starts each hold; the one running now unless a test runs another. */
+    program?: readonly string[];
 }): RuntimeAdapters;

package/dist/adapters/runtime-adapters.js

@@ -1,13 +1,25 @@
 import { realpath } from 'node:fs/promises';
+import { fileURLToPath } from 'node:url';
 import { createCloneWorkspace } from './clone-workspace.js';
 import { createContainerRuntime } from './container.js';
 import { createGitWorkspace } from './git-workspace.js';
+import { createHoldRuntime } from './hold-runtime.js';
 import { createTmux } from './tmux.js';
 /** The session image `release.yml` publishes with each version (decision 0011, 0039). */
 const SESSION_IMAGE = 'ghcr.io/thomashendrickx/aeolus-session';
+/** The trierarch program as it runs now, which starts each hold: `hold` and its words follow. */
+const TRIERARCH_PROGRAM = [process.execPath, fileURLToPath(new URL('../bin/aeolus-trierarch.js', import.meta.url))];
+/**
+ * The sessions on the host (headless H4, H8): one hold per ship, with the
+ * sessions an older trierarch started in tmux listed beside them until each
+ * is replaced (H19).
+ */
+export function hostSessions(at) {
+    return createHoldRuntime({ sessions: at.paths.sessions, program: at.program ?? TRIERARCH_PROGRAM, version: at.version, platform: process.platform, launch: at.launch ?? [], legacy: createTmux() });
+}
 /**
  * The adapters the configuration's session runtime picks (decision 0039): on
- * the host, tmux and a worktree per ship; in containers, a container per ship
+ * the host, a hold per ship and a worktree per ship (headless H4); in containers, a container per ship
  * from the image of the trierarch's own version, with the configured binary
  * and caps and the machine's model token, a clone per ship in place of the
  * worktree, by its real path, and a home of each ship's own.
@@ -17,7 +29,7 @@ export function runtimeAdaptersOf(at) {
     const root = configuration.worktreeRoot ?? paths.worktrees;
     const { runtime } = configuration;
     if (runtime?.kind !== 'container') {
-        return { sessions: createTmux({ launch }), workspace: createGitWorkspace({ configuration, root, ...(trusted !== undefined && { clones: trusted }) }) };
+        return { sessions: hostSessions({ paths, version, launch, ...(at.program !== undefined && { program: at.program }) }), workspace: createGitWorkspace({ configuration, root, ...(trusted !== undefined && { clones: trusted }) }) };
     }
     const clones = createCloneWorkspace({ configuration, root, ...(trusted !== undefined && { clones: trusted }) });
     return {

package/dist/adapters/runtime-adapters.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-adapters.js","sourceRoot":"","sources":["../../src/adapters/runtime-adapters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAM5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAGxD,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,yFAAyF;AACzF,MAAM,aAAa,GAAG,wCAAwC,CAAC;AAU/D;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAAC,EAQjC;IACC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;IACvF,MAAM,IAAI,GAAG,aAAa,CAAC,YAAY,IAAI,KAAK,CAAC,SAAS,CAAC;IAC3D,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;IAClC,IAAI,OAAO,EAAE,IAAI,KAAK,WAAW,EAAE,CAAC;QAClC,OAAO,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,kBAAkB,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG,CAAC,OAAO,KAAK,SAAS,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;IACzJ,CAAC;IACD,MAAM,MAAM,GAAG,oBAAoB,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG,CAAC,OAAO,KAAK,SAAS,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;IAChH,OAAO;QACL,QAAQ,EAAE,sBAAsB,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,aAAa,IAAI,OAAO,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;QAC/N,4JAA4J;QAC5J,SAAS,EAAE,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;QAChH,SAAS,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,eAAe,EAAE;KACnD,CAAC;AACJ,CAAC"}
+{"version":3,"file":"runtime-adapters.js","sourceRoot":"","sources":["../../src/adapters/runtime-adapters.ts"],"names":[],"mappings":"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"}

package/dist/adapters/stop-turn.d.ts

@@ -1,13 +1,13 @@
-import type { ShipId } from '@aeolus-fleet/common';
-import type { SessionRuntime } from '../core/ports.js';
 /**
- * Stops a session's busy turn for a forced message (decision 0040), as a
+ * Stops a busy turn in a terminal for a forced message (decision 0040), as a
  * person does with Escape, then waits for the screen to settle: once it holds
  * still between two reads, the harness takes a new prompt, so the line typed
  * next starts the forced turn instead of joining the stopped one.
  */
-export declare function stopTurn(sessions: Pick<SessionRuntime, 'interrupt' | 'screen'>, at: {
-    shipId: ShipId;
+export declare function stopTurn(session: {
+    escape: () => Promise<void>;
+    screen: () => Promise<string>;
+}, at?: {
     pollMs?: number;
     mostMs?: number;
 }): Promise<void>;

package/dist/adapters/stop-turn.js

@@ -4,19 +4,19 @@ const SETTLE_POLL_MS = 250;
 /** The longest the screen may take to settle: a screen that keeps changing never holds the pass longer. */
 const SETTLE_MOST_MS = 5000;
 /**
- * Stops a session's busy turn for a forced message (decision 0040), as a
+ * Stops a busy turn in a terminal for a forced message (decision 0040), as a
  * person does with Escape, then waits for the screen to settle: once it holds
  * still between two reads, the harness takes a new prompt, so the line typed
  * next starts the forced turn instead of joining the stopped one.
  */
-export async function stopTurn(sessions, at) {
-    const { shipId, pollMs = SETTLE_POLL_MS, mostMs = SETTLE_MOST_MS } = at;
-    await sessions.interrupt(shipId);
+export async function stopTurn(session, at = {}) {
+    const { pollMs = SETTLE_POLL_MS, mostMs = SETTLE_MOST_MS } = at;
+    await session.escape();
     const until = Date.now() + mostMs;
-    let shown = await sessions.screen(shipId);
+    let shown = await session.screen();
     while (Date.now() < until) {
         await wait(pollMs);
-        const now = await sessions.screen(shipId);
+        const now = await session.screen();
         if (now === shown) {
             return;
         }

package/dist/adapters/stop-turn.js.map

@@ -1 +1 @@
-{"version":3,"file":"stop-turn.js","sourceRoot":"","sources":["../../src/adapters/stop-turn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAM1D,oEAAoE;AACpE,MAAM,cAAc,GAAG,GAAG,CAAC;AAC3B,2GAA2G;AAC3G,MAAM,cAAc,GAAG,IAAI,CAAC;AAE5B;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC5B,QAAsD,EACtD,EAAwD;IAExD,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,cAAc,EAAE,MAAM,GAAG,cAAc,EAAE,GAAG,EAAE,CAAC;IACxE,MAAM,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACjC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC;IAClC,IAAI,KAAK,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC1C,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;QAC1B,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC;QACnB,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,GAAG,KAAK,KAAK,EAAE,CAAC;YAClB,OAAO;QACT,CAAC;QACD,KAAK,GAAG,GAAG,CAAC;IACd,CAAC;AACH,CAAC"}
+{"version":3,"file":"stop-turn.js","sourceRoot":"","sources":["../../src/adapters/stop-turn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE1D,oEAAoE;AACpE,MAAM,cAAc,GAAG,GAAG,CAAC;AAC3B,2GAA2G;AAC3G,MAAM,cAAc,GAAG,IAAI,CAAC;AAE5B;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,OAAuE,EAAE,KAA2C,EAAE;IACnJ,MAAM,EAAE,MAAM,GAAG,cAAc,EAAE,MAAM,GAAG,cAAc,EAAE,GAAG,EAAE,CAAC;IAChE,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC;IACvB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC;IAClC,IAAI,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC;IACnC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;QAC1B,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC;QACnB,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC;QACnC,IAAI,GAAG,KAAK,KAAK,EAAE,CAAC;YAClB,OAAO;QACT,CAAC;QACD,KAAK,GAAG,GAAG,CAAC;IACd,CAAC;AACH,CAAC"}

package/dist/adapters/tmux.d.ts

@@ -1,36 +1,13 @@
 import type { SessionRuntime } from '../core/ports.js';
-import type { SessionRoots } from './caller-check.js';
 export declare const TMUX_SERVER = "aeolus-trierarch";
-/** What the tmux command that may start the server runs through: a systemd scope of its own under a systemd unit, which sets INVOCATION_ID. */
-export declare function sessionsLaunch(at: {
-    platform: string;
-    env: Readonly<Record<string, string | undefined>>;
-}): readonly string[];
 /**
- * The host session runtime (docs/architecture.md, "First adapters"): one tmux
- * session per ship, named after its ship id, kept on exit so an exit is seen.
- * The trierarch uses its own tmux server (`tmux -L aeolus-trierarch`), so it
- * never touches the operator's own sessions.
- *
- * The first session started forks the tmux server, which keeps running when
- * the trierarch stops. Under a systemd unit it starts in a scope of its own
- * (`systemd-run --scope`), so it is not left over in the service's control
- * group on a restart (#537), and the unit's stop leaves it alone (#479).
- *
- * A tmux server takes its global environment from the process that starts
- * it, and every session gets it. Anything else may start the server on the
- * trierarch's socket, such as a ship's session after a `tmux kill-server`
- * (#881), so before each start the server's global environment is set back
- * to the trierarch's own: a variable the trierarch has not is removed, one it
- * has with another value is set to its own (#883).
- *
- * A session's command runs without the `TMUX` and `TMUX_PANE` tmux gives
- * its pane: they name the trierarch's server, so a bare `tmux kill-server` in
- * a session, such as a test script's, would end every ship's session (#880).
- * A bare tmux in a session reaches its user's default server instead.
+ * The sessions a trierarch before headless sessions started on the host
+ * (headless H4, H19): one tmux session per ship on its own tmux server
+ * (`tmux -L aeolus-trierarch`), named after its ship id. The trierarch no
+ * longer starts any; it lists them, as of another version, so each is
+ * replaced by a hold once its turn is idle, and stops them. Without a server
+ * running there are none.
  */
 export declare function createTmux(options?: {
     server?: string;
-    launch?: readonly string[];
-    environment?: Readonly<Record<string, string | undefined>>;
-}): SessionRuntime & SessionRoots;
+}): Pick<SessionRuntime, 'list' | 'stop'>;