@agentshouse/kit 0.2.1-ce145e9aadbf6 → 0.2.1-ceeaf32286734

package/dist/clis.js

@@ -1,61 +1,101 @@
 import { spawn } from 'node:child_process';
-import { readFileSync } from 'node:fs';
-import { mkdir, readFile, writeFile } from 'node:fs/promises';
+import { randomUUID } from 'node:crypto';
+import { constants, readFileSync } from 'node:fs';
+import { access, mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises';
 import { homedir, userInfo } from 'node:os';
-import { join } from 'node:path';
+import { delimiter, dirname, isAbsolute, join } from 'node:path';
+import { downloadServed, servedDigest } from './building.js';
 import { kitHome } from './home.js';
-const RUNNING_JOB = new Set(['running', 'paused']);
-async function allowHouseInCodex() {
+import { childEnvironment } from './relay.js';
+const HOUSE_EXECUTABLES = /^host_executable\(name = "house", paths = (\[.*\])\)$/m;
+function houseRule(houses) {
+    return `prefix_rule(pattern = ["house"], decision = "allow")\nhost_executable(name = "house", paths = ${JSON.stringify(houses)})\n`;
+}
+const RAW_SUBTYPES = [
+    'background_tasks_changed',
+    'task_started',
+    'task_updated',
+    'task_notification',
+    'task_progress',
+    'session_state_changed',
+    'hook_started',
+    'hook_response',
+];
+async function executable(path) {
+    try {
+        await access(path, constants.X_OK);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+async function listedHouses(file) {
+    let text;
+    try {
+        text = await readFile(file, 'utf8');
+    }
+    catch (error) {
+        if (error.code === 'ENOENT')
+            return [];
+        throw error;
+    }
+    try {
+        const listed = JSON.parse(HOUSE_EXECUTABLES.exec(text)?.[1] ?? '[]');
+        return Array.isArray(listed) ? listed.filter((house) => typeof house === 'string') : [];
+    }
+    catch {
+        return [];
+    }
+}
+export async function allowHouseInCodex(path) {
+    const candidates = [...new Set(path.split(delimiter).filter((directory) => isAbsolute(directory)))].map((directory) => join(directory, 'house'));
     const rules = join(process.env.CODEX_HOME || join(homedir(), '.codex'), 'rules');
+    const file = join(rules, 'house.rules');
+    const houses = [];
+    for (const house of [...(await listedHouses(file)), ...candidates]) {
+        if (!houses.includes(house) && (await executable(house)))
+            houses.push(house);
+    }
     await mkdir(rules, { recursive: true });
-    await writeFile(join(rules, 'house.rules'), 'prefix_rule(pattern = ["house"], decision = "allow")\n');
+    const temporary = `${file}.${randomUUID()}`;
+    await writeFile(temporary, houseRule(houses));
+    await rename(temporary, file);
 }
 async function nothing() { }
-function threadStatus({ method, params }) {
-    if (method !== 'session/update' || params?.update?.sessionUpdate !== 'session_info_update')
-        return undefined;
-    return params.update._meta?.codex?.threadStatus?.type;
-}
-function asyncTask({ method, params }) {
-    const update = params?.update;
-    if (method !== 'session/update' || update?.asyncTaskId === undefined)
-        return null;
-    if (update.sessionUpdate === 'async_task_spawned')
-        return { id: update.asyncTaskId, running: true };
-    if (update.sessionUpdate === 'async_task_state_update' && !RUNNING_JOB.has(update.state ?? '')) {
-        return { id: update.asyncTaskId, running: false };
-    }
-    return null;
+function answered(error) {
+    return typeof error === 'object' && error !== null ? error : {};
 }
-function airPhase({ _meta }) {
-    const phase = _meta?.jetbrains?.air?.phase;
-    if (phase === 'commentary')
-        return 'note';
-    if (phase === 'final_answer')
-        return 'answer';
-    return null;
+function bridgeInClaudeSandbox(bridge) {
+    return process.platform === 'darwin' ? { allowUnixSockets: [bridge] } : { allowAllUnixSockets: true };
 }
 export const CLIS = {
     'codex-acp': {
         bin: 'codex',
-        minimum: '0.159.1',
+        minimum: '0.160.1',
         install: 'curl -fsSL https://chatgpt.com/codex/install.sh | sh',
-        adapter: { package: '@agentclientprotocol/codex-acp', bin: 'codex-acp', executable: 'CODEX_PATH', env: {} },
+        adapter: {
+            package: '@agentclientprotocol/codex-acp',
+            bin: 'codex-acp',
+            executable: 'CODEX_PATH',
+            env: { CODEX_CONFIG: JSON.stringify({ features: { shell_zsh_fork: true } }) },
+        },
         args: [],
         fullAccess: 'agent-full-access',
-        sessionMeta: {},
+        sessionMeta: () => ({}),
+        unknownSession: (error) => {
+            const { code, data } = answered(error);
+            return code === -32603 && typeof data?.details === 'string' && data.details.startsWith('no rollout found');
+        },
+        renames: true,
         allowHouse: allowHouseInCodex,
         signedIn: { command: ['login', 'status'] },
         login: { args: ['login', '--device-auth'], code: 'show' },
-        queues: false,
-        turnStarted: (notice) => threadStatus(notice) === 'active',
-        turnEnded: (notice) => threadStatus(notice) === 'idle',
-        job: asyncTask,
-        phase: airPhase,
+        air: ['asyncTasks', 'nativeSubagentSessions'],
     },
     'claude-agent-acp': {
         bin: 'claude',
-        minimum: '2.1.286',
+        minimum: '2.1.303',
         install: 'curl -fsSL https://claude.ai/install.sh | bash',
         adapter: {
             package: '@agentclientprotocol/claude-agent-acp',
@@ -65,47 +105,46 @@ export const CLIS = {
         },
         args: [],
         fullAccess: 'bypassPermissions',
-        sessionMeta: { claudeCode: { options: { allowedTools: ['Bash(house:*)'] } } },
+        sessionMeta: (bridge, title) => ({
+            claudeCode: {
+                options: {
+                    allowedTools: ['Bash(house:*)'],
+                    includeHookEvents: true,
+                    title,
+                    settings: { sandbox: { network: bridgeInClaudeSandbox(bridge) } },
+                },
+                emitRawSDKMessages: [...RAW_SUBTYPES.map((subtype) => ({ type: 'system', subtype })), { type: 'result' }],
+            },
+        }),
+        unknownSession: (error) => answered(error).code === -32002,
+        renames: false,
         allowHouse: nothing,
         signedIn: { command: ['auth', 'status'] },
         login: { args: ['auth', 'login', '--claudeai'], code: 'collect', rejected: 'Invalid code' },
-        queues: false,
-        turnStarted: () => false,
-        turnEnded: ({ method, params }) => method === 'session/update' &&
-            params?.update?.sessionUpdate === 'usage_update' &&
-            params.update._meta?.['_claude/origin'] !== undefined,
-        job: asyncTask,
-        phase: () => null,
+        air: ['asyncTasks', 'sessionFailure'],
     },
     'grok-build': {
         bin: 'grok',
         minimum: '1.0.46',
         install: 'curl -fsSL https://x.ai/cli/install.sh | bash',
         adapter: null,
-        args: ['agent', '--always-approve', '--no-leader', 'stdio'],
+        args: ['--sandbox', 'off', 'agent', '--always-approve', '--no-leader', 'stdio'],
         fullAccess: null,
-        sessionMeta: {},
+        sessionMeta: () => ({}),
+        unknownSession: (error) => answered(error).data?.code === 'FS_NOT_FOUND',
+        renames: false,
         allowHouse: nothing,
         signedIn: { initializeMeta: 'defaultAuthMethodId' },
         login: { args: ['login', '--device-auth'], code: 'show' },
-        queues: true,
-        turnStarted: ({ method, params }) => method === '_x.ai/queue/changed' && params?.runningPromptId !== undefined,
-        turnEnded: ({ method, params }) => method === '_x.ai/session_notification' && params?.update?.sessionUpdate === 'turn_completed',
-        job: ({ method, params }) => {
-            if (method === '_x.ai/task_backgrounded')
-                return { id: params.update.task_id, running: true };
-            if (method === '_x.ai/task_completed')
-                return { id: params.update.task_snapshot.task_id, running: false };
-            return null;
-        },
-        phase: () => null,
+        air: ['asyncTasks'],
     },
 };
 const KIT_PACKAGE = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
-export const KIT_VERSION = KIT_PACKAGE.version;
-const PROXY = /^https?_proxy$/i;
+export const KIT_RELEASE = KIT_PACKAGE.version;
 const VERSION = /\d+\.\d+\.\d+(?:-[0-9A-Za-z.]+)?/;
+// An install still running after fifteen minutes is ended and reported as failed, so a hung download cannot hold its CLI's report.
 const INSTALL_MS = 15 * 60_000;
+// A login shell or a version read is ended after half a minute, so a profile that waits for input cannot stall the report.
 const READ_MS = 30_000;
 const CAUSE_CHARACTERS = 4000;
 function prefix(kind) {
@@ -123,18 +162,29 @@ async function installedAdapter(kind) {
         return null;
     }
 }
-export function withoutProxy() {
-    return Object.fromEntries(Object.entries(process.env).filter(([name]) => !PROXY.test(name)));
-}
 export function run(command, args, timeoutMs, detached = false, signal) {
     return new Promise((resolve) => {
         const child = spawn(command, args, {
             stdio: ['ignore', 'pipe', 'pipe'],
             timeout: timeoutMs,
-            env: withoutProxy(),
+            env: childEnvironment(),
             detached,
-            signal,
+            signal: detached ? undefined : signal,
         });
+        const stop = () => {
+            try {
+                process.kill(-child.pid, 'SIGKILL');
+            }
+            catch { }
+        };
+        if (detached && signal?.aborted)
+            stop();
+        if (detached)
+            signal?.addEventListener('abort', stop, { once: true });
+        const ended = (ran) => {
+            signal?.removeEventListener('abort', stop);
+            resolve(ran);
+        };
         let stdout = '';
         let output = '';
         child.stdout.setEncoding('utf8').on('data', (chunk) => {
@@ -144,25 +194,47 @@ export function run(command, args, timeoutMs, detached = false, signal) {
         child.stderr.setEncoding('utf8').on('data', (chunk) => {
             output += chunk;
         });
-        child.on('error', (error) => resolve({ status: null, stdout, output: error.message }));
-        child.on('close', (status) => resolve({ status, stdout, output }));
+        child.on('error', (error) => ended({ status: null, stdout, output: error.message }));
+        child.on('close', (status) => ended({ status, stdout, output }));
     });
 }
 export function failureOf(ran, program) {
     return ran.output.trim().slice(-CAUSE_CHARACTERS) || `${program} exited with ${ran.status ?? 'a signal'}`;
 }
-export async function installAdapter(kind) {
+export function adapterArchive(kind) {
+    return `${kind}-${KIT_PACKAGE.peerDependencies[CLIS[kind].adapter.package]}.tar.gz`;
+}
+export async function installAdapter(kind, signal) {
     const adapter = CLIS[kind].adapter;
     if (adapter === null)
         return null;
-    const release = KIT_PACKAGE.peerDependencies[adapter.package];
-    if ((await installedAdapter(kind)) === release)
+    if ((await installedAdapter(kind)) === KIT_PACKAGE.peerDependencies[adapter.package])
         return null;
-    const ran = await run('npm', ['install', '--prefix', prefix(kind), '--no-save', '--no-audit', '--no-fund', '--omit=optional', `${adapter.package}@${release}`], INSTALL_MS);
-    return ran.status === 0 ? null : failureOf(ran, 'npm');
+    const name = adapterArchive(kind);
+    const archive = `${prefix(kind)}.tar.gz`;
+    const deadline = AbortSignal.timeout(INSTALL_MS);
+    const bounded = signal === undefined ? deadline : AbortSignal.any([signal, deadline]);
+    try {
+        const sha256 = await servedDigest(name, bounded);
+        if (sha256 === null)
+            return `House serves no ${name}`;
+        await rm(prefix(kind), { recursive: true, force: true });
+        await mkdir(prefix(kind), { recursive: true });
+        await downloadServed(name, sha256, archive, bounded);
+        const ran = await run('tar', ['-xzf', archive, '-C', prefix(kind)], INSTALL_MS, true, signal);
+        return ran.status === 0 ? null : failureOf(ran, 'tar');
+    }
+    catch (error) {
+        if (deadline.aborted && signal?.aborted !== true)
+            return `${name} did not arrive within ${INSTALL_MS / 1000} seconds`;
+        return error instanceof Error ? error.message : String(error);
+    }
+    finally {
+        await rm(archive, { force: true });
+    }
 }
-export async function installCli(kind) {
-    const ran = await run('bash', ['-o', 'pipefail', '-c', CLIS[kind].install], INSTALL_MS, true);
+export async function installCli(kind, signal) {
+    const ran = await run('bash', ['-o', 'pipefail', '-c', CLIS[kind].install], INSTALL_MS, true, signal);
     return ran.status === 0 ? null : failureOf(ran, 'the install');
 }
 function loginShell() {
@@ -171,20 +243,29 @@ function loginShell() {
 const FOUND = 'house-kit-cli ';
 const LOOKUP = `found=$(command -v "$1") || exit 0; case $found in /*) ;; *) found=$(pwd -P)/$found ;; esac; printf "${FOUND}%s\\n" "$found"`;
 const USER_BIN = 'case ":$PATH:" in *":$HOME/.local/bin:"*) ;; *) PATH="$PATH:$HOME/.local/bin" ;; esac; export PATH';
-function inLoginShell(script, argument = '') {
-    return run(loginShell(), ['-l', '-i', '-c', `exec /bin/sh -c '${USER_BIN}; ${script}' sh ${argument}`], READ_MS, true);
+function inLoginShell(script, argument = '', signal) {
+    return run(loginShell(), ['-l', '-i', '-c', `exec /bin/sh -c '${USER_BIN}; ${script}' sh ${argument}`], READ_MS, true, signal);
 }
-export async function locate(kind) {
-    const ran = await inLoginShell(LOOKUP, CLIS[kind].bin);
+export async function onLoginPath(program, signal) {
+    const ran = await inLoginShell(LOOKUP, program, signal);
     return ran.stdout.split('\n').findLast((line) => line.startsWith(FOUND))?.slice(FOUND.length) ?? null;
 }
+export function locate(kind, signal) {
+    return onLoginPath(CLIS[kind].bin, signal);
+}
 export async function loginPath() {
     const marker = 'house-kit-path ';
     const ran = await inLoginShell(`printf "${marker}%s\\n" "$PATH"`);
     return ran.stdout.split('\n').findLast((line) => line.startsWith(marker)).slice(marker.length);
 }
-export async function versionOf(path) {
-    return VERSION.exec((await run(path, ['--version'], READ_MS)).stdout)?.[0] ?? null;
+export async function writeCodexRule() {
+    const shell = await loginPath().catch(() => '');
+    await allowHouseInCodex([dirname(process.execPath), process.env.PATH ?? '', shell].join(delimiter)).catch((error) => {
+        throw new Error(`Codex's rule for house could not be written: ${error.message}`);
+    });
+}
+export async function versionOf(path, signal) {
+    return VERSION.exec((await run(path, ['--version'], READ_MS, false, signal)).stdout)?.[0] ?? null;
 }
 function numbers(version) {
     return version.split(/[.-]/, 3).map(Number);

package/dist/codex-main.js

@@ -0,0 +1,58 @@
+#!/usr/bin/env node
+import { spawn } from 'node:child_process';
+import { connect } from 'node:net';
+const KIT_ANSWER = '"house-kit-';
+const SYNC = 'house-kit/sync';
+function lines(each) {
+    let buffer = '';
+    return (chunk) => {
+        buffer += chunk;
+        for (let index = buffer.indexOf('\n'); index >= 0; index = buffer.indexOf('\n')) {
+            each(buffer.slice(0, index + 1));
+            buffer = buffer.slice(index + 1);
+        }
+    };
+}
+function answersKit(line) {
+    if (!line.includes(KIT_ANSWER))
+        return false;
+    try {
+        const message = JSON.parse(line);
+        return message.method === undefined && typeof message.id === 'string' && message.id.startsWith(KIT_ANSWER.slice(1));
+    }
+    catch {
+        return false;
+    }
+}
+const args = process.argv.slice(2);
+const serving = args[0] === 'app-server';
+if (process.env.HOUSE_KIT_SANDBOX === '1' && serving)
+    args.push('--disable', 'memories');
+const codex = spawn(process.env.HOUSE_KIT_CODEX, args, { stdio: ['pipe', 'pipe', 'inherit'] });
+const stream = serving ? connect(process.env.HOUSE_KIT_CODEX_STREAM) : null;
+stream?.on('error', () => undefined);
+process.stdin.setEncoding('utf8').on('data', lines((line) => codex.stdin.write(line)));
+process.stdin.on('end', () => codex.stdin.end());
+stream?.setEncoding('utf8').on('data', lines((line) => {
+    const message = JSON.parse(line);
+    if (message.method === SYNC)
+        stream.write(`${JSON.stringify({ jsonrpc: '2.0', id: message.id, result: {} })}\n`);
+    else
+        codex.stdin.write(line);
+}));
+codex.stdout.setEncoding('utf8').on('data', lines((line) => {
+    stream?.write(line);
+    if (answersKit(line) || process.stdout.write(line))
+        return;
+    codex.stdout.pause();
+    process.stdout.once('drain', () => codex.stdout.resume());
+}));
+codex.stdin.on('error', () => undefined);
+for (const signal of ['SIGTERM', 'SIGINT', 'SIGHUP'])
+    process.on(signal, () => codex.kill(signal));
+codex.on('exit', (code, signal) => {
+    if (signal === null)
+        process.exit(code ?? 1);
+    process.removeAllListeners(signal);
+    process.kill(process.pid, signal);
+});

package/dist/connection.js

@@ -0,0 +1,116 @@
+import { subscribe } from 'node:diagnostics_channel';
+import { HouseRefusal, retryDelay } from './api.js';
+import { end, REPLACED, signInAgain } from './end.js';
+import { readEnrolment } from './home.js';
+import { relayed } from './relay.js';
+import { Silence } from './silence.js';
+import { endUnserved, KIT_WIRE } from './wire.js';
+const PATH = '/kit/stream';
+const SUBPROTOCOL = `house.kit.stream.${KIT_WIRE}`;
+const REFUSAL_HEADER = 'x-house-refusal';
+// House beats each Kit connection every thirty seconds, so two silent beats mean this Kit process cannot hear House.
+export const CONNECTION_SILENCE_MS = 60_000;
+function connectionUrl(house) {
+    const url = new URL(PATH, house);
+    url.protocol = url.protocol === 'https:' ? 'wss:' : 'ws:';
+    return url;
+}
+function header(headers, name) {
+    for (let index = 0; index < headers.length; index += 2) {
+        if (headers[index].toString('latin1').toLowerCase() === name)
+            return headers[index + 1].toString('latin1');
+    }
+    return '';
+}
+let refused = null;
+subscribe('undici:request:headers', (message) => {
+    const { request, response } = message;
+    if (!request.path.endsWith(PATH))
+        return;
+    refused = new HouseRefusal(PATH, response.statusCode, header(response.headers, REFUSAL_HEADER) || response.statusText);
+});
+export function holdConnection(handlers) {
+    let connection = null;
+    let socket = null;
+    let paused = false;
+    let failures = 0;
+    const connect = async () => {
+        const { house, credential } = (await readEnrolment());
+        if (paused || socket !== null)
+            return;
+        refused = null;
+        const opening = new WebSocket(relayed(connectionUrl(house)), {
+            protocols: [SUBPROTOCOL],
+            headers: { authorization: `Bearer ${credential}` },
+        });
+        socket = opening;
+        let opened = false;
+        let silence = null;
+        const closed = (event) => {
+            silence?.stop();
+            silence = null;
+            if (socket === opening)
+                socket = null;
+            if (connection === opening)
+                connection = null;
+            handlers.closed();
+            process.stderr.write(`kit: connection closed ${event.code} ${event.reason}\n`);
+            if (event.reason === 'replaced')
+                end(REPLACED);
+            if (event.reason === 'credential_rejected' || refused?.status === 401) {
+                void signInAgain(credential);
+                return;
+            }
+            if (refused !== null)
+                endUnserved(refused.text);
+            if (!opened && refused !== null)
+                process.stderr.write(`kit: ${refused.message}\n`);
+            if (paused)
+                return;
+            // A closed connection reopens in one to three seconds, spread so Kit processes one restart closed return apart; an opening House refused or left unanswered backs off on the jittered curve, retryable or not, since a resident outlives a House deploy.
+            setTimeout(() => void connect(), opened ? 1000 + Math.random() * 2000 : retryDelay(failures++));
+        };
+        opening.onopen = () => {
+            opened = true;
+            failures = 0;
+            connection = opening;
+            silence = new Silence(CONNECTION_SILENCE_MS, () => {
+                if (connection !== opening)
+                    return;
+                connection = null;
+                opening.onclose = null;
+                opening.close();
+                closed(new CloseEvent('close', { code: 1006, reason: 'heartbeat_missed' }));
+            });
+            silence.heard();
+            handlers.opened();
+        };
+        opening.onmessage = (event) => {
+            silence?.heard();
+            const arrived = JSON.parse(String(event.data));
+            if (arrived.type === 'input')
+                handlers.call(arrived);
+            else if (arrived.type !== 'beat')
+                handlers.notification(arrived);
+        };
+        opening.onerror = () => undefined;
+        opening.onclose = closed;
+    };
+    void connect();
+    return {
+        send(notification) {
+            if (connection === null || connection.readyState !== WebSocket.OPEN)
+                return false;
+            connection.send(JSON.stringify(notification));
+            return true;
+        },
+        pause() {
+            paused = true;
+            socket?.close();
+            return () => {
+                paused = false;
+                void connect();
+            };
+        },
+    };
+}