@aeolus-fleet/trierarch 0.33.1 → 0.34.0

package/dist/adapters/model-logins.js

@@ -0,0 +1,48 @@
+import { PLUGIN_HARNESSES } from './plugin.js';
+/**
+ * Whether a session can start on its login now (api keys K9): on an API key,
+ * only once its harness holds one, so a session never starts to be refused by
+ * the proxy, nor on its subscription instead (K2). On the subscription,
+ * only when nothing the harness reads itself would put a key in reach (K6).
+ */
+export function createModelLogins(at) {
+    return {
+        startProblem: async ({ harness, login, options, folder }) => {
+            if (login === 'subscription') {
+                return subscriptionProblem(at, { harness, options, ...(folder !== undefined && { folder }) });
+            }
+            if (harness === 'copilot') {
+                return "copilot signs in with this computer's own login and runs on no API key: run the ship on its subscription";
+            }
+            const { state, at: since = '' } = await keyStateOf(at, harness);
+            switch (state) {
+                case 'ready':
+                    return undefined;
+                case 'none':
+                    return `${harness} has no API key on this computer: aeolus-trierarch login ${harness} --api-key`;
+                case 'refused':
+                    return `${harness}'s API key was refused by its vendor since ${since}: give it a new one with aeolus-trierarch login ${harness} --api-key`;
+                case 'outOfCredit':
+                    return `${harness}'s API key is out of credit since ${since}: it is checked every 15 minutes, or at once with aeolus-trierarch login ${harness} --check`;
+            }
+        },
+        keyState: (harness) => keyStateOf(at, harness),
+    };
+}
+/** The harness's key state; none for a harness this trierarch keeps no key for. */
+function keyStateOf(at, harness) {
+    const known = PLUGIN_HARNESSES.find((name) => name === harness);
+    return known === undefined ? Promise.resolve({ state: 'none' }) : at.keyStates.stateOf(known);
+}
+/** Why a session of the harness would not run on its subscription alone; none when it would. */
+async function subscriptionProblem(at, session) {
+    if (session.harness === 'claude-code') {
+        const found = await at.claudeCode.keyInReach({ options: session.options, ...(session.folder !== undefined && { folder: session.folder }) });
+        return found === undefined ? undefined : `claude-code would reach an API key on its subscription (${found}): remove it, or run the ship on its API key`;
+    }
+    if (session.harness === 'codex' && (await at.codex.loginKind()) === 'apiKey') {
+        return 'codex is logged in with an API key, not ChatGPT: log Codex in with ChatGPT (codex logout, then codex login), or run the ship on its API key';
+    }
+    return undefined;
+}
+//# sourceMappingURL=model-logins.js.map

package/dist/adapters/model-logins.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-logins.js","sourceRoot":"","sources":["../../src/adapters/model-logins.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAsB,MAAM,aAAa,CAAC;AAEnE;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAC,EAMjC;IACC,OAAO;QACL,YAAY,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE;YAC1D,IAAI,KAAK,KAAK,cAAc,EAAE,CAAC;gBAC7B,OAAO,mBAAmB,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,KAAK,SAAS,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;YAChG,CAAC;YACD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;gBAC1B,OAAO,0GAA0G,CAAC;YACpH,CAAC;YACD,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,GAAG,EAAE,EAAE,GAAG,MAAM,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YAChE,QAAQ,KAAK,EAAE,CAAC;gBACd,KAAK,OAAO;oBACV,OAAO,SAAS,CAAC;gBACnB,KAAK,MAAM;oBACT,OAAO,GAAG,OAAO,4DAA4D,OAAO,YAAY,CAAC;gBACnG,KAAK,SAAS;oBACZ,OAAO,GAAG,OAAO,8CAA8C,KAAK,mDAAmD,OAAO,YAAY,CAAC;gBAC7I,KAAK,aAAa;oBAChB,OAAO,GAAG,OAAO,qCAAqC,KAAK,4EAA4E,OAAO,UAAU,CAAC;YAC7J,CAAC;QACH,CAAC;QACD,QAAQ,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC;KAC/C,CAAC;AACJ,CAAC;AAED,mFAAmF;AACnF,SAAS,UAAU,CAAC,EAA6C,EAAE,OAAe;IAChF,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAyB,EAAE,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;IACvF,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAChG,CAAC;AAED,gGAAgG;AAChG,KAAK,UAAU,mBAAmB,CAAC,EAA2C,EAAE,OAAwF;IACtK,IAAI,OAAO,CAAC,OAAO,KAAK,aAAa,EAAE,CAAC;QACtC,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;QAC5I,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,2DAA2D,KAAK,8CAA8C,CAAC;IAC1J,CAAC;IACD,IAAI,OAAO,CAAC,OAAO,KAAK,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC7E,OAAO,6IAA6I,CAAC;IACvJ,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/adapters/model-proxy.d.ts

@@ -0,0 +1,32 @@
+import { type IncomingMessage, type ServerResponse } from 'node:http';
+import { type PluginHarness } from './plugin.js';
+/**
+ * The model proxy (headless H16, api keys K7): the one process that reads a
+ * harness's API key. A session reaches its vendor through it with a token of
+ * its own; the proxy takes the token only from a running session of that
+ * harness, swaps it for the key, and forwards the request to that harness's
+ * vendor alone: `/anthropic/...` to Anthropic for Claude Code, `/openai/...`
+ * to OpenAI for Codex. Its refusals name neither a key nor a token. It reads
+ * every vendor answer to the key and records what it says of the key (api
+ * keys K9): a success as it streams, an error once whole, before it is sent
+ * on unchanged.
+ */
+export interface ModelProxy {
+    readonly handle: (request: IncomingMessage, response: ServerResponse) => void;
+    /** Checks each key out of credit once (api keys K10), as the proxy does every 15 minutes. */
+    readonly checkOutOfCredit: () => Promise<void>;
+}
+/** The proxy's own path, which answers its version. */
+export declare const STATE_PATH = "/aeolus/state";
+/** The proxy's own path that checks a harness's key at once, `<path>/<harness>` (login --check, K10). */
+export declare const CHECK_PATH = "/aeolus/check/";
+/** How often a key out of credit is checked (K10). */
+export declare const CHECK_INTERVAL_MS: number;
+export declare function createModelProxy(at: {
+    sessions: string;
+    keys: string;
+    keyStates: string;
+    version: string;
+    vendors?: Partial<Record<PluginHarness, string>>;
+    now?: () => Date;
+}): ModelProxy;

package/dist/adapters/model-proxy.js

@@ -0,0 +1,171 @@
+import { request as httpRequest } from 'node:http';
+import { request as httpsRequest } from 'node:https';
+import { z } from 'zod';
+import { readKey } from './key-files.js';
+import { createKeyStates } from './key-states.js';
+import { PLUGIN_HARNESSES } from './plugin.js';
+import { sessionOfToken } from './proxy-tokens.js';
+import { keyStateOfAnswer } from './vendor-answers.js';
+const VENDOR_URLS = { 'claude-code': 'https://api.anthropic.com', codex: 'https://api.openai.com' };
+/** The path each harness's base URL ends in, which names its vendor. */
+const PREFIXES = { anthropic: 'claude-code', openai: 'codex' };
+/** The proxy's own path, which answers its version. */
+export const STATE_PATH = '/aeolus/state';
+/** The proxy's own path that checks a harness's key at once, `<path>/<harness>` (login --check, K10). */
+export const CHECK_PATH = '/aeolus/check/';
+/** How often a key out of credit is checked (K10). */
+export const CHECK_INTERVAL_MS = 15 * 60 * 1000;
+/** Each vendor's cheapest models, by a word in their ids, cheapest first: the check spends as little as the vendor bills. */
+const CHEAPEST = { 'claude-code': ['haiku'], codex: ['nano', 'mini'] };
+const ANTHROPIC_VERSION = '2023-06-01';
+/** The fewest output tokens the Responses API takes. */
+const OPENAI_FEWEST_OUTPUT_TOKENS = 16;
+const modelListSchema = z.object({ data: z.array(z.object({ id: z.string() })) });
+/** What the session sent that never goes on: its own credentials, and what belongs to its connection to the proxy. */
+const DROPPED_HEADERS = new Set(['authorization', 'x-api-key', 'host', 'connection', 'keep-alive', 'proxy-authorization', 'proxy-connection', 'transfer-encoding', 'upgrade']);
+const BEARER = /^Bearer (?<token>\S+)$/u;
+const HTTP_UNAUTHORIZED = 401;
+const HTTP_NOT_FOUND = 404;
+const HTTP_BAD_GATEWAY = 502;
+/** An answer from this status on is an error, read whole before it is sent on. */
+const HTTP_ERRORS_FROM = 300;
+/** How much of an error's body is read for what it says of the key: a vendor's error is a short JSON object. */
+const ERROR_BODY_READ_BYTES = 64 * 1024;
+function refuse(response, refusal) {
+    const { status, message } = refusal;
+    response.writeHead(status, { 'content-type': 'application/json' });
+    response.end(JSON.stringify({ type: 'error', error: { type: status === HTTP_UNAUTHORIZED ? 'authentication_error' : 'not_found_error', message: `aeolus model proxy: ${message}` } }));
+}
+export function createModelProxy(at) {
+    const keyStates = createKeyStates({ keys: at.keys, file: at.keyStates });
+    const now = at.now ?? (() => new Date());
+    /** Kept before the answer goes on, so the trierarch knows the key's state by the time the session does; a failed write is tried again on the next answer. */
+    const recordAnswer = async (harness, answer) => {
+        const state = keyStateOfAnswer({ harness, ...answer });
+        if (state !== undefined) {
+            await keyStates.record(harness, { state, at: now() }).catch(() => undefined);
+        }
+    };
+    const vendorOf = (harness) => at.vendors?.[harness] ?? VENDOR_URLS[harness];
+    const headersOf = (harness, key) => (harness === 'claude-code' ? { 'x-api-key': key, 'anthropic-version': ANTHROPIC_VERSION } : { authorization: `Bearer ${key}` });
+    /** One request the vendor bills, on its cheapest model it lists for the key, and what its answer says of the key recorded. */
+    const checkKey = async (harness) => {
+        const key = await readKey(at.keys, harness);
+        if (key === undefined) {
+            return;
+        }
+        const vendor = vendorOf(harness);
+        const listed = modelListSchema.safeParse(await (await fetch(`${vendor}/v1/models`, { headers: headersOf(harness, key) }).catch(() => undefined))?.json().catch(() => undefined));
+        const ids = listed.success ? listed.data.data.map((model) => model.id) : [];
+        const model = CHEAPEST[harness].flatMap((word) => ids.filter((id) => id.includes(word))).at(0);
+        if (model === undefined) {
+            return;
+        }
+        const [path, body] = harness === 'claude-code' ? ['/v1/messages', { model, max_tokens: 1, messages: [{ role: 'user', content: 'Hi' }] }] : ['/v1/responses', { model, input: 'Hi', max_output_tokens: OPENAI_FEWEST_OUTPUT_TOKENS }];
+        const answer = await fetch(`${vendor}${path}`, { method: 'POST', headers: { ...headersOf(harness, key), 'content-type': 'application/json' }, body: JSON.stringify(body) }).catch(() => undefined);
+        if (answer !== undefined) {
+            await recordAnswer(harness, { status: answer.status, body: await answer.text().catch(() => '') });
+        }
+    };
+    const routeOf = (path) => {
+        const [, prefix = '', ...rest] = path.split('/');
+        const harness = PREFIXES[prefix];
+        if (harness === undefined) {
+            return undefined;
+        }
+        const vendor = at.vendors?.[harness] ?? VENDOR_URLS[harness];
+        const keyHeaders = harness === 'claude-code' ? (key) => ({ 'x-api-key': key }) : (key) => ({ authorization: `Bearer ${key}` });
+        return { route: { harness, vendor, keyHeaders }, rest: `/${rest.join('/')}` };
+    };
+    const forward = async (request, response) => {
+        const path = request.url ?? '/';
+        const checked = PLUGIN_HARNESSES.find((harness) => path === `${CHECK_PATH}${harness}`);
+        if (checked !== undefined && request.method === 'POST') {
+            if ((await keyStates.stateOf(checked)).state === 'outOfCredit') {
+                await checkKey(checked);
+            }
+            response.writeHead(200, { 'content-type': 'application/json' });
+            response.end(JSON.stringify(await keyStates.stateOf(checked)));
+            return;
+        }
+        if (path === STATE_PATH) {
+            response.writeHead(200, { 'content-type': 'application/json' });
+            response.end(JSON.stringify({ version: at.version }));
+            return;
+        }
+        const routed = routeOf(path);
+        if (routed === undefined) {
+            refuse(response, { status: HTTP_NOT_FOUND, message: 'it forwards only to the harnesses\' vendors' });
+            return;
+        }
+        const { route, rest } = routed;
+        const token = BEARER.exec(request.headers.authorization ?? '')?.groups?.token ?? (typeof request.headers['x-api-key'] === 'string' ? request.headers['x-api-key'] : undefined);
+        const shipId = token === undefined ? undefined : await sessionOfToken(at.sessions, { harness: route.harness, token });
+        if (shipId === undefined) {
+            refuse(response, { status: HTTP_UNAUTHORIZED, message: 'not the token of a running session of this harness' });
+            return;
+        }
+        const key = await readKey(at.keys, route.harness);
+        if (key === undefined) {
+            refuse(response, { status: HTTP_UNAUTHORIZED, message: `this computer holds no API key for ${route.harness}` });
+            return;
+        }
+        // The vendor's origin is fixed, and the path only ever set on it: a path is never resolved as a URL, which could name another host.
+        const vendorOrigin = new URL(route.vendor).origin;
+        const target = new URL(vendorOrigin);
+        const queryAt = rest.indexOf('?');
+        target.pathname = queryAt === -1 ? rest : rest.slice(0, queryAt);
+        target.search = queryAt === -1 ? '' : rest.slice(queryAt);
+        if (target.origin !== vendorOrigin) {
+            refuse(response, { status: HTTP_NOT_FOUND, message: 'it forwards only to the harnesses\' vendors' });
+            return;
+        }
+        const headers = { ...Object.fromEntries(Object.entries(request.headers).filter(([name]) => !DROPPED_HEADERS.has(name))), ...route.keyHeaders(key) };
+        const send = target.protocol === 'https:' ? httpsRequest : httpRequest;
+        const outgoing = send(target, { method: request.method, headers }, (answer) => {
+            const status = answer.statusCode ?? HTTP_BAD_GATEWAY;
+            const answerHeaders = Object.fromEntries(Object.entries(answer.headers).filter(([name]) => name !== 'connection' && name !== 'transfer-encoding'));
+            if (status < HTTP_ERRORS_FROM) {
+                answer.pause();
+                void recordAnswer(route.harness, { status, body: '' }).then(() => {
+                    response.writeHead(status, answerHeaders);
+                    answer.pipe(response);
+                });
+                return;
+            }
+            const chunks = [];
+            answer.on('data', (chunk) => chunks.push(chunk));
+            answer.on('end', () => {
+                const body = Buffer.concat(chunks);
+                void recordAnswer(route.harness, { status, body: body.subarray(0, ERROR_BODY_READ_BYTES).toString('utf8') }).then(() => {
+                    response.writeHead(status, answerHeaders);
+                    response.end(body);
+                });
+            });
+        });
+        outgoing.on('error', () => {
+            if (!response.headersSent) {
+                refuse(response, { status: HTTP_BAD_GATEWAY, message: `${target.host} could not be reached` });
+            }
+            else {
+                response.destroy();
+            }
+        });
+        request.pipe(outgoing);
+    };
+    return {
+        handle: (request, response) => {
+            forward(request, response).catch(() => {
+                response.destroy();
+            });
+        },
+        checkOutOfCredit: async () => {
+            for (const harness of PLUGIN_HARNESSES) {
+                if ((await keyStates.stateOf(harness)).state === 'outOfCredit') {
+                    await checkKey(harness);
+                }
+            }
+        },
+    };
+}
+//# sourceMappingURL=model-proxy.js.map

package/dist/adapters/model-proxy.js.map

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

package/dist/adapters/paths.d.ts

@@ -12,6 +12,10 @@ export interface TrierarchPaths {
     readonly crewToken: string;
     /** The machine's long-lived model token, handed to each container session (decision 0039); never in the configuration. */
     readonly modelToken: string;
+    /** Each harness's API key, one file per harness (api keys K5); only login writes it, never the configuration. */
+    readonly keys: string;
+    /** The model proxy's files, its pid and its port (headless H16). */
+    readonly proxy: string;
     readonly state: string;
     /** What detection found per harness (#365), apart from the configuration. */
     readonly detected: string;

package/dist/adapters/paths.js

@@ -7,6 +7,8 @@ export function trierarchPaths(at) {
         configSchema: join(home, 'config.schema.json'),
         crewToken: join(home, 'crew-token'),
         modelToken: join(home, 'model-token'),
+        keys: join(home, 'keys'),
+        proxy: join(home, 'proxy'),
         state: join(home, 'state.json'),
         detected: join(home, 'detected.json'),
         running: join(home, 'running.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;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"}
+{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../src/adapters/paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAyCjC,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,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC;QACxB,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC;QAC1B,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/plugin.d.ts

@@ -2,23 +2,26 @@ import type { AeolusPlugin } from './plugin-identity.js';
 /** The harnesses that install the aeolus-fleet plugin, each in its own plugin folders. */
 export type PluginHarness = 'claude-code' | 'codex';
 export declare const PLUGIN_HARNESSES: readonly PluginHarness[];
+/** Every harness the aeolus-fleet plugin crews a ship from: Claude Code and Codex, and Copilot, whose plugin the trierarch neither upgrades nor gives an API key. */
+export type CrewHarness = PluginHarness | 'copilot';
 /** The aeolus-fleet plugin's data folder in a harness's plugin folders, as both harnesses name it. */
 export declare const PLUGIN_DATA_FOLDER = "aeolus-fleet-aeolus-fleet";
 /**
- * Where a harness installed the aeolus-fleet plugin: the newest version in its
- * plugin cache, looked up again at each use so a plugin upgrade without a
- * service restart moves along (#828), and the plugin's data folder, unless
- * variables name others
+ * Where a harness installed the aeolus-fleet plugin: for Claude Code and
+ * Codex the newest version in its plugin cache, looked up again at each use
+ * so a plugin upgrade without a service restart moves along (#828), and the
+ * plugin's data folder, unless variables name others
  * (AEOLUS_PLUGIN_ROOT and AEOLUS_PLUGIN_DATA for Claude Code,
  * AEOLUS_CODEX_PLUGIN_ROOT and AEOLUS_CODEX_PLUGIN_DATA for Codex). The
- * folders follow CLAUDE_CONFIG_DIR and CODEX_HOME as the harnesses do. The
- * identities of the harness's sessions live in ~/.aeolus/crews/<harness>, as
- * the plugin keeps them (decision 0015).
+ * folders follow CLAUDE_CONFIG_DIR and CODEX_HOME as the harnesses do. For
+ * Copilot, as findCopilotPlugin says. The identities of the harness's
+ * sessions live in ~/.aeolus/crews/<harness>, as the plugin keeps them
+ * (decision 0015).
  */
 export declare function findAeolusPlugin(at: {
     homeDirectory: string;
     env: Readonly<Record<string, string | undefined>>;
-    harness?: PluginHarness;
+    harness?: CrewHarness;
 }): Promise<AeolusPlugin>;
 /**
  * The version of the aeolus-fleet plugin a harness uses, as the manifest that

package/dist/adapters/plugin.js

@@ -1,10 +1,12 @@
-import { readdir, readFile } from 'node:fs/promises';
+import { readdir, readFile, stat } from 'node:fs/promises';
 import { join } from 'node:path';
 import { z } from 'zod';
 export const PLUGIN_HARNESSES = ['claude-code', 'codex'];
+/** The manifest each harness reads the plugin's version from. */
+const MANIFESTS = { 'claude-code': '.claude-plugin', codex: '.codex-plugin', copilot: join('.github', 'plugin') };
 /** The aeolus-fleet plugin's data folder in a harness's plugin folders, as both harnesses name it. */
 export const PLUGIN_DATA_FOLDER = 'aeolus-fleet-aeolus-fleet';
-/** Where each harness keeps its plugins, and the variables that point elsewhere. */
+/** Where Claude Code and Codex keep their plugins, and the variables that point elsewhere. */
 function placesOf(at) {
     const { homeDirectory, env } = at;
     if (at.harness === 'codex') {
@@ -13,21 +15,52 @@ function placesOf(at) {
     return { name: 'Claude Code', plugins: join(env.CLAUDE_CONFIG_DIR ?? join(homeDirectory, '.claude'), 'plugins'), root: env.AEOLUS_PLUGIN_ROOT, data: env.AEOLUS_PLUGIN_DATA, rootVariable: 'AEOLUS_PLUGIN_ROOT' };
 }
 /**
- * Where a harness installed the aeolus-fleet plugin: the newest version in its
- * plugin cache, looked up again at each use so a plugin upgrade without a
- * service restart moves along (#828), and the plugin's data folder, unless
- * variables name others
+ * Where Copilot installed the aeolus-fleet plugin: one folder per plugin in its
+ * installed-plugins folder, with no version in the path, and the data folder
+ * Copilot gives its hooks (`COPILOT_PLUGIN_DATA`, as Copilot CLI 1.0.105 sets
+ * it), both in COPILOT_HOME when it is set, unless AEOLUS_COPILOT_PLUGIN_ROOT
+ * and AEOLUS_COPILOT_PLUGIN_DATA name others, as for a plugin Copilot loads
+ * live from a local marketplace. Unlike Claude Code's and Codex's, a missing
+ * one does not stop the trierarch at start: the machine does not offer
+ * Copilot until it is installed.
+ */
+function findCopilotPlugin(at) {
+    const { env } = at;
+    const copilotHome = env.COPILOT_HOME ?? join(at.homeDirectory, '.copilot');
+    const data = env.AEOLUS_COPILOT_PLUGIN_DATA ?? join(copilotHome, 'plugin-data', 'aeolus-fleet', 'aeolus-fleet');
+    const root = env.AEOLUS_COPILOT_PLUGIN_ROOT ?? join(copilotHome, 'installed-plugins', 'aeolus-fleet', 'aeolus-fleet');
+    if (env.AEOLUS_COPILOT_PLUGIN_ROOT !== undefined) {
+        return Promise.resolve({ root: () => Promise.resolve(root), data, crews: at.crews });
+    }
+    // Looked for at each use, never at start: the trierarch starts without it, names Copilot as not offered, and finds it once installed (#1212).
+    const installed = async () => {
+        if ((await stat(root).catch(() => undefined)) === undefined) {
+            throw new Error(`The aeolus-fleet plugin is not installed for Copilot (nothing in ${root}): install it, or set AEOLUS_COPILOT_PLUGIN_ROOT`);
+        }
+        return root;
+    };
+    return Promise.resolve({ root: installed, data, crews: at.crews });
+}
+/**
+ * Where a harness installed the aeolus-fleet plugin: for Claude Code and
+ * Codex the newest version in its plugin cache, looked up again at each use
+ * so a plugin upgrade without a service restart moves along (#828), and the
+ * plugin's data folder, unless variables name others
  * (AEOLUS_PLUGIN_ROOT and AEOLUS_PLUGIN_DATA for Claude Code,
  * AEOLUS_CODEX_PLUGIN_ROOT and AEOLUS_CODEX_PLUGIN_DATA for Codex). The
- * folders follow CLAUDE_CONFIG_DIR and CODEX_HOME as the harnesses do. The
- * identities of the harness's sessions live in ~/.aeolus/crews/<harness>, as
- * the plugin keeps them (decision 0015).
+ * folders follow CLAUDE_CONFIG_DIR and CODEX_HOME as the harnesses do. For
+ * Copilot, as findCopilotPlugin says. The identities of the harness's
+ * sessions live in ~/.aeolus/crews/<harness>, as the plugin keeps them
+ * (decision 0015).
  */
 export async function findAeolusPlugin(at) {
     const harness = at.harness ?? 'claude-code';
+    const crews = join(at.homeDirectory, '.aeolus', 'crews', harness);
+    if (harness === 'copilot') {
+        return findCopilotPlugin({ ...at, crews });
+    }
     const places = placesOf({ ...at, harness });
     const data = places.data ?? join(places.plugins, 'data', PLUGIN_DATA_FOLDER);
-    const crews = join(at.homeDirectory, '.aeolus', 'crews', harness);
     const { root } = places;
     if (root !== undefined) {
         return { root: () => Promise.resolve(root), data, crews };
@@ -58,16 +91,17 @@ const manifestSchema = z.object({ version: z.string() });
  * its manifest says no version.
  */
 export async function aeolusPluginVersion(at) {
-    if (at.harness !== 'claude-code' && at.harness !== 'codex') {
+    const harness = [...PLUGIN_HARNESSES, 'copilot'].find((name) => name === at.harness);
+    if (harness === undefined) {
         return undefined;
     }
-    const root = await findAeolusPlugin({ ...at, harness: at.harness })
+    const root = await findAeolusPlugin({ ...at, harness })
         .then((plugin) => plugin.root())
         .catch(() => undefined);
     if (root === undefined) {
         return undefined;
     }
-    const manifest = join(root, at.harness === 'codex' ? '.codex-plugin' : '.claude-plugin', 'plugin.json');
+    const manifest = join(root, MANIFESTS[harness], 'plugin.json');
     const text = await readFile(manifest, 'utf8').catch(() => undefined);
     if (text === undefined) {
         return undefined;

package/dist/adapters/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/adapters/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB,MAAM,CAAC,MAAM,gBAAgB,GAA6B,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;AAEnF,sGAAsG;AACtG,MAAM,CAAC,MAAM,kBAAkB,GAAG,2BAA2B,CAAC;AAE9D,oFAAoF;AACpF,SAAS,QAAQ,CAAC,EAAwG;IACxH,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;IAClC,IAAI,EAAE,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;QAC3B,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,IAAI,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,EAAE,SAAS,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,wBAAwB,EAAE,IAAI,EAAE,GAAG,CAAC,wBAAwB,EAAE,YAAY,EAAE,0BAA0B,EAAE,CAAC;IACxN,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,iBAAiB,IAAI,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,EAAE,SAAS,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,kBAAkB,EAAE,IAAI,EAAE,GAAG,CAAC,kBAAkB,EAAE,YAAY,EAAE,oBAAoB,EAAE,CAAC;AACpN,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EAAyG;IAC9I,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,IAAI,aAAa,CAAC;IAC5C,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAC7E,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,aAAa,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAClE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IACxB,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IAC5D,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;IAC5E,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC;IAC7E,MAAM,MAAM,GAAG,KAAK,IAAqB,EAAE;QACzC,MAAM,QAAQ,GAAG,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvH,MAAM,OAAO,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAChC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,MAAM,eAAe,GAAG,CAAC,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACrH,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,MAAM,IAAI,KAAK,CAAC,gDAAgD,MAAM,CAAC,IAAI,qBAAqB,YAAY,yBAAyB,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;YAC9J,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,gDAAgD,MAAM,CAAC,IAAI,gBAAgB,KAAK,yBAAyB,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;QAClJ,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC9B,CAAC,CAAC;IACF,6EAA6E;IAC7E,MAAM,MAAM,EAAE,CAAC;IACf,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;AACvC,CAAC;AAED,gEAAgE;AAChE,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAEzD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,EAAiG;IACzI,IAAI,EAAE,CAAC,OAAO,KAAK,aAAa,IAAI,EAAE,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;QAC3D,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,CAAC;SAChE,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;SAC/B,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAC1B,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC;IACxG,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IACrE,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1D,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1D,CAAC;IAAC,MAAM,CAAC;QACP,8CAA8C;QAC9C,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,iEAAiE;AACjE,MAAM,UAAU,SAAS,CAAC,IAAY,EAAE,KAAa;IACnD,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAC9E,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QAC1C,MAAM,UAAU,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QACzD,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO,UAAU,CAAC;QACpB,CAAC;IACH,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/adapters/plugin.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,31 @@
+/**
+ * Keeps the model proxy running while a harness needs it (headless H16): one
+ * per machine, started like a hold, nobody's child and under a systemd unit
+ * in a scope of its own, so a restart of the service ends no session's way to
+ * its vendor. A proxy that is gone is started again on its port; one another
+ * version started is replaced; one no harness needs is stopped.
+ */
+export interface ProxyRuntime {
+    keep(at: {
+        isNeeded: boolean;
+    }): Promise<void>;
+    /** Where sessions reach the proxy; none before it first listened. */
+    url(): Promise<string | undefined>;
+}
+export interface ProxyFiles {
+    readonly pid: string;
+    readonly port: string;
+}
+/** Where the proxy records each harness's key state (api keys K8), which the trierarch reads. */
+export declare function keyStatesFileOf(folder: string): string;
+export declare function proxyFilesOf(folder: string): ProxyFiles;
+export declare function createProxyRuntime(options: {
+    folder: string;
+    sessions: string;
+    keys: string;
+    /** The trierarch program, which `proxy` and its words follow. */
+    program: readonly string[];
+    version: string;
+    /** What the proxy's start goes through: a systemd scope of its own under a systemd unit (see sessionsLaunch). */
+    launch?: readonly string[];
+}): ProxyRuntime;

package/dist/adapters/proxy-runtime.js

@@ -0,0 +1,100 @@
+import { spawn } from 'node:child_process';
+import { readFile, rm } from 'node:fs/promises';
+import { join } from 'node:path';
+import { setTimeout as wait } from 'node:timers/promises';
+import { z } from 'zod';
+import { STATE_PATH } from './model-proxy.js';
+/** Where the proxy records each harness's key state (api keys K8), which the trierarch reads. */
+export function keyStatesFileOf(folder) {
+    return join(folder, 'key-states.json');
+}
+export function proxyFilesOf(folder) {
+    return { pid: join(folder, 'proxy.pid'), port: join(folder, 'port') };
+}
+const STATE_TIMEOUT_MS = 2000;
+const START_WAIT_MS = 10_000;
+const POLL_MS = 50;
+const STOP_WAIT_MS = 5000;
+/** Runs the command in the background and returns at once, as a hold's start does. */
+const DETACHED = '"$@" < /dev/null > /dev/null 2>&1 &';
+const stateSchema = z.object({ version: z.string() });
+export function createProxyRuntime(options) {
+    const files = proxyFilesOf(options.folder);
+    const url = async () => {
+        const port = Number(await readFile(files.port, 'utf8').catch(() => ''));
+        return Number.isInteger(port) && port > 0 ? `http://127.0.0.1:${String(port)}` : undefined;
+    };
+    /** The version the proxy at its address answers; none when nothing answers. */
+    const answeredVersion = async () => {
+        const at = await url();
+        if (at === undefined) {
+            return undefined;
+        }
+        const answer = await fetch(`${at}${STATE_PATH}`, { signal: AbortSignal.timeout(STATE_TIMEOUT_MS) }).catch(() => undefined);
+        const state = stateSchema.safeParse(answer?.ok === true ? await answer.json().catch(() => undefined) : undefined);
+        return state.success ? state.data.version : undefined;
+    };
+    const runningPid = async () => {
+        const pid = Number(await readFile(files.pid, 'utf8').catch(() => ''));
+        if (!Number.isInteger(pid) || pid <= 1) {
+            return undefined;
+        }
+        try {
+            process.kill(pid, 0);
+            return pid;
+        }
+        catch {
+            return undefined;
+        }
+    };
+    const stop = async () => {
+        const pid = await runningPid();
+        if (pid !== undefined) {
+            process.kill(pid, 'SIGTERM');
+            const until = Date.now() + STOP_WAIT_MS;
+            while ((await runningPid()) !== undefined && Date.now() < until) {
+                await wait(POLL_MS);
+            }
+            if ((await runningPid()) !== undefined) {
+                process.kill(pid, 'SIGKILL');
+            }
+        }
+        await rm(files.pid, { force: true });
+    };
+    const start = async () => {
+        const proxy = [...options.program, 'proxy', '--folder', options.folder, '--sessions', options.sessions, '--keys', options.keys];
+        const [program = 'sh', ...args] = [...(options.launch ?? []), 'sh', '-c', DETACHED, 'sh', ...proxy];
+        const starter = spawn(program, args, { stdio: 'ignore', detached: true });
+        await new Promise((resolve, reject) => {
+            starter.on('error', reject);
+            starter.on('exit', () => {
+                resolve();
+            });
+        });
+        const until = Date.now() + START_WAIT_MS;
+        while (Date.now() < until) {
+            if ((await runningPid()) !== undefined && (await answeredVersion()) !== undefined) {
+                return;
+            }
+            await wait(POLL_MS);
+        }
+        throw new Error(`the model proxy did not answer within ${String(START_WAIT_MS)} ms of its start`);
+    };
+    return {
+        keep: async ({ isNeeded }) => {
+            if (!isNeeded) {
+                await stop();
+                return;
+            }
+            const version = await answeredVersion();
+            if (version === options.version) {
+                return;
+            }
+            // Its pid file goes before the start, so the wait sees the new proxy's.
+            await stop();
+            await start();
+        },
+        url,
+    };
+}
+//# sourceMappingURL=proxy-runtime.js.map

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

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