@agentshouse/kit 0.2.1-cb345f4157685 → 0.2.1-cb66cb2fd0696

package/dist/calls.js

@@ -0,0 +1,71 @@
+import { existsSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { kitHome } from './home.js';
+function logged(error) {
+    process.stderr.write(`kit: ${error instanceof Error ? error.message : String(error)}\n`);
+}
+export class Calls {
+    house;
+    changed;
+    carried = new Map();
+    path = join(kitHome(), 'call-results.json');
+    results;
+    returned = new Set();
+    released = new Set();
+    open = 0;
+    constructor(house, changed) {
+        this.house = house;
+        this.changed = changed;
+        this.results = new Map(existsSync(this.path) ? Object.entries(JSON.parse(readFileSync(this.path, 'utf8'))) : []);
+    }
+    keepResult(callId, result) {
+        if (this.returned.has(callId))
+            return;
+        this.results.set(callId, result);
+        this.save();
+    }
+    idle() {
+        return this.open === 0;
+    }
+    carry(callId, work) {
+        if (this.released.has(callId))
+            return Promise.resolve();
+        const known = this.carried.get(callId);
+        const result = this.results.get(callId);
+        const carried = known ?? (result === undefined ? work() : Promise.resolve({ result }));
+        if (known === undefined) {
+            this.carried.set(callId, carried);
+            carried.catch(() => this.carried.delete(callId));
+        }
+        this.open++;
+        this.changed();
+        return carried
+            .then(async ({ result, returned, release }) => {
+            try {
+                await this.house.deliver(`/kit/inputs/${callId}/ack`, result);
+            }
+            finally {
+                this.returned.add(callId);
+                if (this.results.delete(callId))
+                    this.save();
+            }
+            if (known !== undefined)
+                return;
+            if (release) {
+                this.carried.delete(callId);
+                this.released.add(callId);
+            }
+            await returned?.();
+        })
+            .catch(logged)
+            .finally(() => {
+            this.open--;
+            this.changed();
+        });
+    }
+    save() {
+        const temporary = `${this.path}.${process.pid}`;
+        writeFileSync(temporary, JSON.stringify(Object.fromEntries(this.results)), { mode: 0o600 });
+        renameSync(temporary, this.path);
+    }
+}

package/dist/clis.js

@@ -4,7 +4,8 @@ import { constants, readFileSync } from 'node:fs';
 import { access, mkdir, readFile, rename, writeFile } from 'node:fs/promises';
 import { homedir, userInfo } from 'node:os';
 import { delimiter, dirname, isAbsolute, join } from 'node:path';
-import { kitHome } from './home.js';
+import { releaseDirectory } from './placement.js';
+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`;
@@ -14,6 +15,7 @@ const RAW_SUBTYPES = [
     'task_started',
     'task_updated',
     'task_notification',
+    'task_progress',
     'session_state_changed',
     'hook_started',
     'hook_response',
@@ -69,8 +71,9 @@ function bridgeInClaudeSandbox(bridge) {
 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',
+        update: 'codex update',
         adapter: {
             package: '@agentclientprotocol/codex-acp',
             bin: 'codex-acp',
@@ -92,8 +95,9 @@ export const CLIS = {
     },
     'claude-agent-acp': {
         bin: 'claude',
-        minimum: '2.1.286',
+        minimum: '2.1.303',
         install: 'curl -fsSL https://claude.ai/install.sh | bash',
+        update: 'claude update',
         adapter: {
             package: '@agentclientprotocol/claude-agent-acp',
             bin: 'claude-agent-acp',
@@ -110,7 +114,7 @@ export const CLIS = {
                     title,
                     settings: { sandbox: { network: bridgeInClaudeSandbox(bridge) } },
                 },
-                emitRawSDKMessages: RAW_SUBTYPES.map((subtype) => ({ type: 'system', subtype })),
+                emitRawSDKMessages: [...RAW_SUBTYPES.map((subtype) => ({ type: 'system', subtype })), { type: 'result' }],
             },
         }),
         unknownSession: (error) => answered(error).code === -32002,
@@ -124,6 +128,7 @@ export const CLIS = {
         bin: 'grok',
         minimum: '1.0.46',
         install: 'curl -fsSL https://x.ai/cli/install.sh | bash',
+        update: 'grok update',
         adapter: null,
         args: ['--sandbox', 'off', 'agent', '--always-approve', '--no-leader', 'stdio'],
         fullAccess: null,
@@ -137,38 +142,22 @@ export const CLIS = {
     },
 };
 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.
+// An install or update still running after fifteen minutes is ended as failed, so a hung download can neither hold its CLI's report nor keep the Kit busy.
 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) {
-    return join(kitHome(), 'agents', kind);
-}
 export function adapterCommand(kind) {
-    return join(prefix(kind), 'node_modules', '.bin', CLIS[kind].adapter.bin);
-}
-async function installedAdapter(kind) {
-    try {
-        const manifest = join(prefix(kind), 'node_modules', CLIS[kind].adapter.package, 'package.json');
-        return JSON.parse(await readFile(manifest, 'utf8')).version;
-    }
-    catch {
-        return null;
-    }
-}
-export function withoutProxy() {
-    return Object.fromEntries(Object.entries(process.env).filter(([name]) => !PROXY.test(name)));
+    return join(releaseDirectory(KIT_RELEASE), 'adapters', kind, 'node_modules', '.bin', CLIS[kind].adapter.bin);
 }
 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: detached ? undefined : signal,
         });
@@ -202,19 +191,18 @@ export function run(command, args, timeoutMs, detached = false, signal) {
 export function failureOf(ran, program) {
     return ran.output.trim().slice(-CAUSE_CHARACTERS) || `${program} exited with ${ran.status ?? 'a signal'}`;
 }
-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)
-        return null;
-    const ran = await run('npm', ['install', '--prefix', prefix(kind), '--cache', join(kitHome(), 'npm-cache'), '--no-save', '--no-audit', '--no-fund', '--omit=optional', `${adapter.package}@${release}`], INSTALL_MS, true, signal);
-    return ran.status === 0 ? null : failureOf(ran, 'npm');
+export function adapterArchive(kind) {
+    return `${kind}-${KIT_PACKAGE.peerDependencies[CLIS[kind].adapter.package]}.tar.gz`;
+}
+async function bounded(program, work, signal) {
+    const deadline = AbortSignal.timeout(INSTALL_MS);
+    const ran = await work(signal === undefined ? deadline : AbortSignal.any([signal, deadline]));
+    if (deadline.aborted && signal?.aborted !== true)
+        return `${program} did not end within ${INSTALL_MS / 1000} seconds`;
+    return ran.status === 0 ? null : failureOf(ran, program);
 }
-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');
+export function installCli(kind, signal) {
+    return bounded('the install', (within) => run('bash', ['-o', 'pipefail', '-c', CLIS[kind].install], INSTALL_MS, true, within), signal);
 }
 function loginShell() {
     return process.env.SHELL || userInfo().shell;
@@ -222,13 +210,19 @@ 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 = '', signal) {
-    return run(loginShell(), ['-l', '-i', '-c', `exec /bin/sh -c '${USER_BIN}; ${script}' sh ${argument}`], READ_MS, true, signal);
+function inLoginShell(script, argument = '', signal, timeoutMs = READ_MS) {
+    return run(loginShell(), ['-l', '-i', '-c', `exec /bin/sh -c '${USER_BIN}; ${script}' sh ${argument}`], timeoutMs, true, signal);
 }
-export async function locate(kind, signal) {
-    const ran = await inLoginShell(LOOKUP, CLIS[kind].bin, signal);
+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 function updateCli(kind) {
+    return bounded('the update', (within) => inLoginShell(CLIS[kind].update, '', within, INSTALL_MS));
+}
 export async function loginPath() {
     const marker = 'house-kit-path ';
     const ran = await inLoginShell(`printf "${marker}%s\\n" "$PATH"`);

package/dist/{stream.js → connection.js}

@@ -1,43 +1,16 @@
 import { subscribe } from 'node:diagnostics_channel';
 import { HouseRefusal, retryDelay } from './api.js';
-import { end, REPLACED, signInAgain, updateRequired } from './end.js';
+import { end, REPLACED, signInAgain } from './end.js';
 import { readEnrolment } from './home.js';
 import { relayed } from './relay.js';
-import { KIT_WIRE, tooOld } from './wire.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 stream every thirty seconds, so two silent beats mean this Kit cannot hear House.
-export const STREAM_SILENCE_MS = 60_000;
-const SYSTEM_STREAM_CLOCK = {
-    later: (delay, callback) => setTimeout(callback, delay),
-    clear: (timer) => clearTimeout(timer),
-};
-export class StreamSilence {
-    timer = null;
-    silent;
-    clock;
-    interval;
-    constructor(silent, clock = SYSTEM_STREAM_CLOCK, interval = STREAM_SILENCE_MS) {
-        this.silent = silent;
-        this.clock = clock;
-        this.interval = interval;
-    }
-    heard() {
-        this.stop();
-        this.timer = this.clock.later(this.interval, () => {
-            this.timer = null;
-            this.silent();
-        });
-    }
-    stop() {
-        if (this.timer === null)
-            return;
-        this.clock.clear(this.timer);
-        this.timer = null;
-    }
-}
-function streamUrl(house) {
+// 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;
@@ -56,16 +29,20 @@ subscribe('undici:request:headers', (message) => {
         return;
     refused = new HouseRefusal(PATH, response.statusCode, header(response.headers, REFUSAL_HEADER) || response.statusText);
 });
-export function holdStream(handlers) {
+export function holdConnection(handlers) {
+    let connection = null;
     let socket = null;
     let failures = 0;
     const connect = async () => {
         const { house, credential } = (await readEnrolment());
+        if (socket !== null)
+            return;
         refused = null;
-        const opening = new WebSocket(relayed(streamUrl(house)), {
+        const opening = new WebSocket(relayed(connectionUrl(house)), {
             protocols: [SUBPROTOCOL],
             headers: { authorization: `Bearer ${credential}` },
         });
+        socket = opening;
         let opened = false;
         let silence = null;
         const closed = (event) => {
@@ -73,28 +50,31 @@ export function holdStream(handlers) {
             silence = null;
             if (socket === opening)
                 socket = null;
-            process.stderr.write(`kit: control stream closed ${event.code} ${event.reason}\n`);
+            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 && tooOld(refused.text))
-                updateRequired();
+            if (refused !== null)
+                endUnserved(refused.text);
             if (!opened && refused !== null)
                 process.stderr.write(`kit: ${refused.message}\n`);
-            // A closed socket reopens in one to three seconds, spread so Kits 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.
+            // 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;
-            socket = opening;
-            silence = new StreamSilence(() => {
-                if (socket !== opening)
+            connection = opening;
+            silence = new Silence(CONNECTION_SILENCE_MS, () => {
+                if (connection !== opening)
                     return;
-                socket = null;
+                connection = null;
                 opening.onclose = null;
                 opening.close();
                 closed(new CloseEvent('close', { code: 1006, reason: 'heartbeat_missed' }));
@@ -104,19 +84,21 @@ export function holdStream(handlers) {
         };
         opening.onmessage = (event) => {
             silence?.heard();
-            const frame = JSON.parse(String(event.data));
-            if (frame.type !== 'beat')
-                handlers.frame(frame);
+            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(frame) {
-            if (socket === null || socket.readyState !== WebSocket.OPEN)
+        send(notification) {
+            if (connection === null || connection.readyState !== WebSocket.OPEN)
                 return false;
-            socket.send(JSON.stringify(frame));
+            connection.send(JSON.stringify(notification));
             return true;
         },
     };