@agentshouse/kit 0.2.1-c5883630417e1 → 0.2.1-c5cb352412cd2

package/dist/kit-main.js

@@ -1,69 +1,10 @@
 #!/usr/bin/env node
-import { setGlobalProxyFromEnv } from 'node:http';
-import { parseArgs } from 'node:util';
-import { answerGitCredential } from './app-git.js';
-import { chatgpt } from './chatgpt.js';
-import { login } from './login.js';
-import { logout } from './logout.js';
-import { resident } from './resident.js';
-const USAGE = 'usage: kit <login|logout|resident|chatgpt>\n';
-const COMMANDS = new Map([
-    [
-        'logout',
-        {
-            usage: 'usage: kit logout',
-            about: "disconnects this computer, stops House Kit and ends your own agent's connection",
-            operands: 0,
-            run: logout,
-        },
-    ],
-    [
-        'resident',
-        {
-            usage: 'usage: kit resident',
-            about: "keeps this Environment connected; House Kit's service runs it",
-            operands: 0,
-            run: resident,
-        },
-    ],
-    [
-        'git-credential',
-        {
-            usage: 'usage: kit git-credential <get|store|erase>',
-            about: "answers git with your own agent's House credential; git runs it",
-            operands: 1,
-            run: ([operation]) => answerGitCredential(operation),
-        },
-    ],
-]);
-const [command, ...argv] = process.argv.slice(2);
-setGlobalProxyFromEnv();
-async function run() {
-    if (command === 'login')
-        return login(argv);
-    if (command === 'chatgpt')
-        return chatgpt(argv);
-    if (command === '--help') {
-        parseArgs({ args: argv });
-        process.stdout.write(USAGE);
-        return;
-    }
-    const chosen = COMMANDS.get(command ?? '');
-    if (chosen === undefined) {
-        process.stderr.write(USAGE);
-        process.exitCode = 2;
-        return;
-    }
-    const { values, positionals } = parseArgs({ args: argv, options: { help: { type: 'boolean', default: false } }, allowPositionals: true });
-    if (positionals.length > chosen.operands)
-        throw new Error(`unexpected argument ${positionals[chosen.operands]}; ${chosen.usage}`);
-    if (values.help) {
-        process.stdout.write(`${chosen.usage}\n  ${chosen.about}\n`);
-        return;
-    }
-    return chosen.run(positionals);
-}
-run().catch((error) => {
-    process.stderr.write(`kit: ${error instanceof Error ? error.message : String(error)}\n`);
+const [major = 0, minor = 0] = process.versions.node.split('.').map(Number);
+if (major < 24 || (major === 24 && minor < 14)) {
+    process.stderr.write(`kit: the Kit needs Node 24.14.0 or newer; this is ${process.versions.node}\n`);
     process.exitCode = 1;
-});
+}
+else {
+    await import('./kit-cli.js');
+}
+export {};

package/dist/login.js

@@ -36,6 +36,13 @@ const USAGE = `usage: kit login [--house <origin>] [--environment <id>] [--rooms
   --no-private              give this Environment every Room but your Private Room
   --code <code>             connect this machine with a login code
 `;
+function connected(house, named, environment) {
+    if (named === undefined)
+        return `Environment ${environment} is connected to ${house}.\n`;
+    if (named === environment)
+        return `Environment ${environment} is reconnected to ${house}.\n`;
+    return `Environment ${named} stays with its account; this computer is connected to ${house} as new Environment ${environment} of the account that confirmed.\n`;
+}
 function gone(error) {
     return error instanceof HouseRefusal && refusalOf(error.text)?.code === 'kit_environment_not_found';
 }
@@ -81,6 +88,7 @@ export async function login(argv) {
     const environment = replaces === undefined ? (values.environment ?? remembered) : undefined;
     const ownAgent = await readOwnAgent();
     let held = false;
+    let named = environment;
     let exchanged;
     if (values.code !== undefined) {
         exchanged = await post(house, '/kit/token', { code: values.code, label: hostname() });
@@ -88,7 +96,7 @@ export async function login(argv) {
     else {
         held = ownAgent !== null && ownAgent.house === house && (await accepted(house, ownAgent.credential));
         const verifier = randomBytes(32).toString('base64url');
-        const start = (named) => retrying(() => post(house, '/kit', {
+        const start = () => retrying(() => post(house, '/kit', {
             label: hostname(),
             ...(named === undefined
                 ? { act: 'new_environment', ...(replaces === undefined ? {} : { replaces }) }
@@ -99,14 +107,15 @@ export async function login(argv) {
         }));
         let started;
         try {
-            started = await start(environment);
+            started = await start();
         }
         catch (error) {
             if (remembered === undefined || !gone(error))
                 throw error;
             await forgetDisconnected();
             process.stdout.write(`House no longer holds Environment ${remembered}; connecting this computer as a new one.\n`);
-            started = await start(undefined);
+            named = undefined;
+            started = await start();
         }
         process.stdout.write(`Open this link and confirm: ${started.start_url}\n`);
         open(started.start_url);
@@ -121,7 +130,7 @@ export async function login(argv) {
         environment: exchanged.environment,
         credential: exchanged.credential,
     });
-    process.stdout.write(`Environment ${exchanged.environment} is connected to ${house}.\n`);
+    process.stdout.write(connected(house, named, exchanged.environment));
     if (exchanged.headless_credential !== undefined) {
         await writeOwnAgent({ house, ...relayRecord, user: exchanged.user, credential: exchanged.headless_credential });
     }

package/dist/placement.js

@@ -2,7 +2,6 @@ import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { run } from './clis.js';
 import { kitHome } from './home.js';
-import { relayOrigin } from './relay.js';
 export function service() {
     if (process.platform !== 'linux' || !process.env.INVOCATION_ID)
         return null;
@@ -19,9 +18,9 @@ export async function updatesItself() {
     // sudo answers at once, so ten seconds only bounds a stuck sudo.
     return (await run('sudo', ['-n', 'true'], 10_000)).status === 0;
 }
-function installed() {
+export function installCommand() {
     try {
-        return readFileSync(join(kitHome(), 'placement'), 'utf8').trim();
+        return readFileSync(join(kitHome(), 'install-command'), 'utf8').trim();
     }
     catch (error) {
         if (error.code === 'ENOENT')
@@ -29,20 +28,3 @@ function installed() {
         throw error;
     }
 }
-function entries(house) {
-    const host = new URL(house).host;
-    const relay = relayOrigin();
-    if (relay === undefined)
-        return [`curl -fsSL ${host}/kit | sh`, `irm ${host}/kit.ps1 | iex`];
-    const entry = `${relay}/${host}/kit`;
-    return [`curl -fsSL ${entry} | HOUSE_KIT_RELAY=${relay} sh`, `$env:HOUSE_KIT_RELAY='${relay}'; irm ${entry}.ps1 | iex`];
-}
-export function installCommand(house) {
-    const [shell, windows] = entries(house);
-    const placement = installed();
-    if (placement === 'native')
-        return shell;
-    if (placement === 'server')
-        return `${shell} -s -- --linux`;
-    return `${shell} -s -- --container, or ${windows} on Windows`;
-}

package/dist/resident.js

@@ -10,7 +10,7 @@ import { received } from './bridge.js';
 import { CONVERSATION_INPUTS, Conversations } from './conversations.js';
 import { LocalCopies } from './copies.js';
 import { restart } from './end.js';
-import { agentBase, enrolled, forgetRestart, kitHome, restartAsked } from './home.js';
+import { agentBase, enrolled, forgetRestart, kitHome, ownerSocket, restartAsked } from './home.js';
 import { killDescendants } from './scope.js';
 import { quoted } from './shell.js';
 import { SignIns } from './sign-in.js';
@@ -30,7 +30,7 @@ async function installShim(path, module) {
     await writeFile(path, `#!/bin/sh\nexec ${quoted(process.execPath)} ${quoted(main)} "$@"\n`, { mode: 0o755 });
 }
 async function serveOwner(copies) {
-    const socketPath = join(kitHome(), 'owner.sock');
+    const socketPath = ownerSocket();
     await rm(socketPath, { force: true });
     const server = createServer(async (request, response) => {
         try {

package/dist/stream.js

@@ -7,6 +7,36 @@ import { KIT_WIRE, tooOld } 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) {
     const url = new URL(PATH, house);
     url.protocol = url.protocol === 'https:' ? 'wss:' : 'ws:';
@@ -37,17 +67,10 @@ export function holdStream(handlers) {
             headers: { authorization: `Bearer ${credential}` },
         });
         let opened = false;
-        opening.onopen = () => {
-            opened = true;
-            failures = 0;
-            socket = opening;
-            handlers.opened();
-        };
-        opening.onmessage = (event) => {
-            handlers.frame(JSON.parse(String(event.data)));
-        };
-        opening.onerror = () => undefined;
-        opening.onclose = (event) => {
+        let silence = null;
+        const closed = (event) => {
+            silence?.stop();
+            silence = null;
             if (socket === opening)
                 socket = null;
             process.stderr.write(`kit: control stream closed ${event.code} ${event.reason}\n`);
@@ -58,12 +81,35 @@ export function holdStream(handlers) {
                 return;
             }
             if (refused !== null && tooOld(refused.text))
-                updateRequired(house);
+                updateRequired();
             if (finalRefusal(refused))
                 end(refused.message);
             // A closed socket reopens in one to three seconds, spread so Kits one restart closed return apart; an opening House refused as retryable or left unanswered backs off on the jittered curve.
             setTimeout(() => void connect(), opened ? 1000 + Math.random() * 2000 : retryDelay(failures++));
         };
+        opening.onopen = () => {
+            opened = true;
+            failures = 0;
+            socket = opening;
+            silence = new StreamSilence(() => {
+                if (socket !== opening)
+                    return;
+                socket = 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 frame = JSON.parse(String(event.data));
+            if (frame.type !== 'beat')
+                handlers.frame(frame);
+        };
+        opening.onerror = () => undefined;
+        opening.onclose = closed;
     };
     void connect();
     return {

package/dist/work.js

@@ -1,11 +1,11 @@
 import { randomUUID } from 'node:crypto';
 import { once } from 'node:events';
 import { readFileSync } from 'node:fs';
-import { mkdir, rm } from 'node:fs/promises';
+import { rm } from 'node:fs/promises';
 import { createServer } from 'node:net';
 import { join } from 'node:path';
 import { RUNNING_JOB } from './events.js';
-import { kitHome } from './home.js';
+import { kitHome, socketDirectory } from './home.js';
 const ENDED_TASK = new Set(['completed', 'failed', 'killed']);
 const SCHEDULING = new Set(['CronCreate', 'CronDelete', 'ScheduleWakeup']);
 const QUEUE_LIST = 'house-kit-queue-';
@@ -194,9 +194,7 @@ class CodexWork extends Work {
     proving = -1;
     proven = -1;
     async open(cli) {
-        const sockets = join(kitHome(), 'bridges');
-        await mkdir(sockets, { recursive: true, mode: 0o700 });
-        this.path = join(sockets, `${randomUUID()}.sock`);
+        this.path = join(socketDirectory(), `${randomUUID()}.sock`);
         this.server = createServer((socket) => this.connected(socket));
         this.server.listen(this.path);
         await once(this.server, 'listening');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentshouse/kit",
-  "version": "0.2.1-c5883630417e1",
+  "version": "0.2.1-c5cb352412cd2",
   "description": "House Kit connects an Environment to agents.house.",
   "license": "MIT",
   "repository": {