@agentshouse/kit 0.2.1-c3e4a20bb3183 → 0.2.1-c4d151f197958

package/dist/house-main.js

@@ -6,10 +6,14 @@ import { basename, join } from 'node:path';
 import { kitHome, readOwnAgent } from './home.js';
 import { callHouse, rpc, UNREACHABLE } from './mcp.js';
 import { refusalOf } from './refusals.js';
+import { relayed } from './relay.js';
+import { parse } from 'yaml';
 const USAGE = "usage: house <tool> ['<arguments as JSON>']";
-const GIT_USAGE = 'usage: house git push [commit] [--owner]';
+const PUSH_USAGE = 'usage: house push [commit] [--owner]';
+const PUSH = "push [commit]: sends the Local copy's committed changes to House";
 const ARGUMENTS = `the arguments are one JSON object in single quotes, like house search '{"query":"invoice"}'`;
 const CLOSED = "this conversation's House connection is closed; nothing to do from here";
+const SANDBOXED = "your CLI's sandbox kept house from House; run house directly, not through another program";
 const REVOKED = 'this conversation no longer has House access; nothing to do from here';
 const UNCONNECTED = "this computer's own agent has no House connection; run kit login";
 const DISCONNECTED = "House no longer accepts this computer's own agent; run kit login";
@@ -41,7 +45,7 @@ function bridged(path, body, headers = { 'content-type': 'application/json' }, t
                     reject(new Error(refused(path, answer.statusCode, text)));
             });
         });
-        sent.on('error', () => reject(new Error(CLOSED)));
+        sent.on('error', (error) => reject(new Error(error.code === 'EPERM' || error.code === 'EACCES' ? SANDBOXED : CLOSED)));
         sent.end(body instanceof Buffer ? body : JSON.stringify(body));
     });
 }
@@ -77,11 +81,24 @@ async function localFile(path) {
             : `${path} is not a readable file`);
     }
 }
+async function sent(url, bytes, operation) {
+    const headers = { 'content-type': 'application/octet-stream', 'x-house-byte-operation': operation };
+    if (socketPath !== undefined)
+        return bridged(url, bytes, headers);
+    setGlobalProxyFromEnv();
+    const answer = await fetch(relayed(url), { method: 'POST', headers, body: bytes }).catch(() => {
+        throw new Error(UNREACHABLE);
+    });
+    const text = await answer.text();
+    if (answer.status === 200)
+        return text;
+    throw new Error(refused(url, answer.status, text));
+}
 async function upload(path, roomRef, missing) {
     if (typeof path !== 'string' || path === '')
         throw new Error(missing);
     const bytes = await localFile(path);
-    const declared = JSON.parse(await bridged('/kit/attachments/upload', {
+    const declared = parse(await called('upload', {
         ...(roomRef === undefined ? {} : { room_ref: roomRef }),
         name: basename(path),
         bytes: bytes.length,
@@ -89,25 +106,20 @@ async function upload(path, roomRef, missing) {
     }));
     if (declared.upload === undefined)
         return declared.attachment;
-    const saved = JSON.parse(await bridged(declared.upload.url, bytes, {
-        'content-type': 'application/octet-stream',
-        'x-house-byte-operation': declared.upload.operation,
-    }));
+    const saved = JSON.parse(await sent(declared.upload.url, bytes, declared.upload.operation));
     if (saved.upload_failure !== undefined)
         throw new Error(`${path} was not saved: ${saved.upload_failure}; call again later`);
     return saved.attachment;
 }
-async function gitPush(args) {
+async function push(args) {
     if (args.includes('--help'))
-        return GIT_USAGE;
-    if (args[0] !== 'push')
-        throw new Error('only house git push [commit] exists; use plain git for the rest');
+        return PUSH_USAGE;
     const owner = args.includes('--owner');
-    const commit = args.slice(1).find((arg) => arg !== '--owner') ?? 'HEAD';
+    const commit = args.find((arg) => arg !== '--owner') ?? 'HEAD';
     if (owner && socketPath !== undefined)
-        throw new Error('--owner is not for Agent conversations; run house git push without it');
+        throw new Error('--owner is not for Agent conversations; run house push without it');
     if (!owner && socketPath === undefined)
-        throw new Error('outside an Agent conversation, house git push needs --owner');
+        throw new Error('outside an Agent conversation, house push needs --owner');
     const pushed = JSON.parse(await bridged('/git/push', { cwd: process.cwd(), commit }, undefined, owner ? join(kitHome(), 'owner.sock') : socketPath));
     if (pushed.refused)
         throw new Error(pushed.text);
@@ -128,35 +140,40 @@ function argumentsOf(argument) {
     return parsed;
 }
 async function house([verb, argument]) {
-    if (verb === undefined || verb === '--help') {
-        return [USAGE, 'git push [commit]', ...(await tools()).map((tool) => `${tool.name}: ${tool.description}`)].join('\n');
+    if (verb === undefined || verb === '--help' || verb === 'help') {
+        return [USAGE, 'help', PUSH, ...(await tools()).map((tool) => (tool.description === undefined ? tool.name : `${tool.name}: ${tool.description}`))].join('\n');
     }
     if (argument === '--help') {
         const tool = (await tools()).find((listed) => listed.name === verb);
         if (tool === undefined)
             throw new Error(`${verb} is no Tool; house find_command '{"query":"${verb}"}' finds Commands`);
-        return `${tool.description}\n${JSON.stringify(tool.inputSchema)}`;
+        return [...(tool.description === undefined ? [] : [tool.description]), JSON.stringify(tool.inputSchema)].join('\n');
     }
     const args = argumentsOf(argument);
-    if (socketPath !== undefined && verb === 'upload_attachment') {
-        return JSON.stringify({ attachment: await upload(args.path, args.room_ref, 'upload_attachment needs "path", a local file') });
+    if (verb === 'upload') {
+        return JSON.stringify({ attachment: await upload(args.path, args.room_ref, 'upload needs "path", a local file') });
     }
-    if (socketPath !== undefined && verb === 'append_record' && Array.isArray(args.attachments)) {
+    if (verb === 'append_record' && Array.isArray(args.attachments)) {
         const attachments = [];
         for (const path of args.attachments) {
             attachments.push(await upload(path, args.room_ref, 'each attachments entry is the path of a local file'));
         }
         args.attachments = attachments;
     }
-    const result = await mcp('tools/call', { name: verb, arguments: args });
+    return called(verb, args);
+}
+async function called(name, args) {
+    const result = await mcp('tools/call', { name, arguments: args });
     const text = result.content.map((content) => content.text).join('\n');
     if (result.isError === true)
         throw new Error(text.replace(/\n+$/, ''));
     return text;
 }
 const argv = process.argv.slice(2);
-(argv[0] === 'git' ? gitPush(argv.slice(1)) : house(argv)).then((text) => {
+(argv[0] === 'push' ? push(argv.slice(1)) : house(argv)).then((text) => {
     process.stdout.write(`${text}\n`);
+    if (argv[0] === 'shell')
+        process.exitCode = Number(/^exit: (\d+)(?:\n|$)/.exec(text)?.[1] ?? 0);
 }, (error) => {
     process.stderr.write(`house: ${error instanceof Error ? error.message : String(error)}\n`);
     process.exitCode = 1;

package/dist/instructions.js

@@ -1,8 +1,8 @@
 import { HOW_WE_WORK } from './skills.js';
 const HOUSE_LINE = 'Work with House through the `house` CLI: run `house --help`.';
-const FILE_LINE = 'To give the User a file or a page, upload it with `house upload_attachment` and link it; never start a server.';
-const READ_LINE = 'Before working in a Room, read `/private/rooms/<handle>/AGENTS.md`.';
-const COPIES_LINE = 'House Local copies; commit, then `house git push`:';
+const FILE_LINE = 'To give the User a file or a page, upload it with `house upload` and link it; never start a server.';
+const READ_LINE = 'Before working in a Room, read `/rooms/private/rooms/<handle>/AGENTS.md`.';
+const COPIES_LINE = 'House Local copies; commit, then `house push`:';
 const UNREADABLE = /^(?:\S+: )?(?:path_not_found|room_not_found|operation_denied)\b/;
 const FAILED = /^exit: [1-9]\d*$/;
 const CUT = /^stderr: shell: output_cut (\d+) of \d+ bytes; continue with: (.+)$/;

package/dist/kit-main.js

@@ -1,15 +1,21 @@
 #!/usr/bin/env node
 import { setGlobalProxyFromEnv } from 'node:http';
+import { answerGitCredential } from './app-git.js';
 import { login } from './login.js';
+import { logout } from './logout.js';
 import { resident } from './resident.js';
 const [command, ...argv] = process.argv.slice(2);
 setGlobalProxyFromEnv();
 async function run() {
     if (command === 'login')
         return login(argv);
+    if (command === 'logout')
+        return logout();
     if (command === 'resident')
         return resident();
-    process.stderr.write('usage: kit <login|resident>\n');
+    if (command === 'git-credential')
+        return answerGitCredential(argv[0]);
+    process.stderr.write('usage: kit <login|logout|resident>\n');
     process.exitCode = 2;
 }
 run().catch((error) => {

package/dist/login.js

@@ -1,53 +1,19 @@
+import { spawn } from 'node:child_process';
 import { createHash, randomBytes } from 'node:crypto';
-import { createServer } from 'node:http';
 import { hostname } from 'node:os';
-import { createInterface } from 'node:readline/promises';
 import { parseArgs } from 'node:util';
-import { post } from './api.js';
-import { forgetOwnAgent, readEnrolment, readOwnAgent, writeEnrolment, writeOwnAgent } from './home.js';
+import { post, retrying } from './api.js';
+import { placeAppGit } from './app-git.js';
+import { forgetOwnAgent, readDisconnected, readEnrolment, readOwnAgent, writeEnrolment, writeOwnAgent } from './home.js';
 import { callHouse, rpc } from './mcp.js';
 const DEFAULT_HOUSE = 'https://agents.house';
-function listen() {
-    return new Promise((resolve, reject) => {
-        let deliver = () => undefined;
-        let held = null;
-        const code = new Promise((settle) => {
-            deliver = settle;
-        });
-        const server = createServer((request, response) => {
-            const received = new URL(request.url ?? '/', 'http://127.0.0.1').searchParams.get('code');
-            if (received === null || held !== null) {
-                response.writeHead(404).end();
-                return;
-            }
-            held = response;
-            deliver(received);
-        });
-        const close = () => {
-            server.close();
-            server.closeAllConnections();
-        };
-        const port = Number(process.env.HOUSE_KIT_LOGIN_PORT ?? 0);
-        server.once('error', reject);
-        server.listen(port, port === 0 ? '127.0.0.1' : '0.0.0.0', () => {
-            const address = server.address();
-            if (address === null || typeof address === 'string') {
-                reject(new Error('the login callback has no port'));
-                return;
-            }
-            resolve({
-                uri: `http://127.0.0.1:${address.port}/callback`,
-                code,
-                answer: (text) => new Promise((written) => {
-                    if (held === null || held.destroyed || !held.socket || held.socket.destroyed)
-                        return written();
-                    held.once('close', () => written());
-                    held.writeHead(200, { 'content-type': 'text/plain; charset=utf-8', connection: 'close' }).end(`${text}\n`);
-                }),
-                close,
-            });
-        });
-    });
+const OPENER = process.platform === 'darwin' ? 'open' : 'xdg-open';
+// Polling every two seconds brings the User's confirmation to the waiting Kit moments after they give it.
+const POLL_INTERVAL_MS = 2000;
+function open(link) {
+    spawn(OPENER, [link], { detached: true, stdio: 'ignore' })
+        .on('error', () => undefined)
+        .unref();
 }
 async function accepted(house, credential) {
     const checked = await callHouse(house, credential, rpc('tools/list', {}));
@@ -57,80 +23,39 @@ async function accepted(house, credential) {
         return false;
     throw new Error(`House answered ${checked.status} when Kit checked this computer's own agent's connection: ${checked.text}`);
 }
-async function typed(question) {
-    const reader = createInterface({ input: process.stdin, output: process.stdout });
-    const closed = new Promise((_, reject) => {
-        reader.once('close', () => reject(new Error('no code was typed')));
-    });
-    try {
-        return (await Promise.race([reader.question(question), closed])).trim();
-    }
-    finally {
-        reader.close();
-    }
-}
 export async function login(argv) {
     const { values } = parseArgs({
         args: argv,
         options: {
             house: { type: 'string' },
             environment: { type: 'string' },
-            manual: { type: 'boolean', default: false },
         },
     });
-    const enrolled = await readEnrolment();
+    const enrolled = (await readEnrolment()) ?? (await readDisconnected());
     const house = values.house ?? enrolled?.house ?? DEFAULT_HOUSE;
     const replaces = process.env.HOUSE_KIT_REPLACES;
     const environment = replaces === undefined ? (values.environment ?? (enrolled?.house === house ? enrolled.environment : undefined)) : undefined;
     const ownAgent = await readOwnAgent();
     const held = ownAgent !== null && ownAgent.house === house && (await accepted(house, ownAgent.credential));
     const verifier = randomBytes(32).toString('base64url');
-    const started = {
+    const started = await retrying(() => post(house, '/kit', {
         ...(environment === undefined
             ? { act: 'new_environment', label: hostname(), ...(replaces === undefined ? {} : { replaces }) }
             : { act: 'existing_environment', environment_id: environment }),
         code_challenge: createHash('sha256').update(verifier).digest('base64url'),
         ...(held ? {} : { headless: true }),
-    };
-    const exchange = async (code) => {
-        const exchanged = await post(house, '/kit/token', { code, code_verifier: verifier });
-        await writeEnrolment({ house, environment: exchanged.environment, credential: exchanged.credential });
-        process.stdout.write(`Environment ${exchanged.environment} is connected to ${house}.\n`);
-        if (exchanged.headless_credential !== undefined) {
-            await writeOwnAgent({ house, user: exchanged.user, credential: exchanged.headless_credential });
-        }
-        else if (held && ownAgent.user !== exchanged.user) {
-            await forgetOwnAgent();
-            process.stdout.write("This computer's own agent was another User's; run kit login again to connect it to you.\n");
-        }
-    };
-    if (values.manual) {
-        const { start_url } = await post(house, '/kit', {
-            ...started,
-            presentation: 'manual',
-        });
-        process.stdout.write(`Open this link and confirm: ${start_url}\n`);
-        await exchange(await typed('Code: '));
-        return;
-    }
-    const callback = await listen();
-    try {
-        const { start_url } = await post(house, '/kit', {
-            ...started,
-            presentation: 'loopback',
-            loopback_uri: callback.uri,
-        });
-        process.stdout.write(`Open this link and confirm: ${start_url}\n`);
-        try {
-            await exchange(await callback.code);
-        }
-        catch (error) {
-            await callback.answer(`This Environment was not connected: ${error.message}`);
-            throw error;
-        }
-        await callback.answer('This Environment is connected. You can close this tab.');
+    }));
+    process.stdout.write(`Open this link and confirm: ${started.start_url}\n`);
+    open(started.start_url);
+    const exchanged = await retrying(() => post(house, '/kit/token', { login: started.login, code_verifier: verifier }), undefined, () => POLL_INTERVAL_MS);
+    await writeEnrolment({ house, environment: exchanged.environment, credential: exchanged.credential });
+    process.stdout.write(`Environment ${exchanged.environment} is connected to ${house}.\n`);
+    if (exchanged.headless_credential !== undefined) {
+        await writeOwnAgent({ house, user: exchanged.user, credential: exchanged.headless_credential });
     }
-    finally {
-        callback.close();
+    else if (held && ownAgent.user !== exchanged.user) {
+        await forgetOwnAgent();
+        process.stdout.write("This computer's own agent was another User's; run kit login again to connect it to you.\n");
     }
+    await placeAppGit(ownAgent, await readOwnAgent());
 }

package/dist/logout.js

@@ -0,0 +1,27 @@
+import { HouseRefusal, post } from './api.js';
+import { forgetAppGit } from './app-git.js';
+import { forgetEnrolment, forgetOwnAgent, readEnrolment, readOwnAgent } from './home.js';
+const KEPT_CONNECTION = "House had already disconnected this computer, so its own agent's connection stays until you revoke it on Connections.\n";
+export async function logout() {
+    const enrolled = await readEnrolment();
+    const ownAgent = await readOwnAgent();
+    let refused = false;
+    if (enrolled !== null) {
+        try {
+            await post(enrolled.house, '/kit/logout', {}, enrolled.credential);
+        }
+        catch (error) {
+            if (!(error instanceof HouseRefusal && error.status === 401))
+                throw error;
+            refused = true;
+        }
+        await forgetEnrolment(enrolled);
+    }
+    await forgetAppGit();
+    await forgetOwnAgent();
+    process.stdout.write(enrolled === null
+        ? 'This computer is not connected to House.\n'
+        : `Environment ${enrolled.environment} is disconnected; kit login reconnects it.\n`);
+    if (ownAgent !== null && (enrolled === null || refused))
+        process.stdout.write(KEPT_CONNECTION);
+}

package/dist/mcp.js

@@ -1,5 +1,6 @@
 import { randomUUID } from 'node:crypto';
 import { KIT_VERSION } from './clis.js';
+import { relayed } from './relay.js';
 const MCP_PROTOCOL_VERSION = '2026-07-28';
 export const UNREACHABLE = 'House is unreachable; call again in a minute';
 export function rpc(method, params) {
@@ -21,7 +22,7 @@ export function mcpBody(message, operation) {
 }
 export async function callHouse(origin, credential, message, operation = null, signal) {
     const tool = message.method === 'tools/call' ? String(message.params.name) : null;
-    const answer = await fetch(new URL('/', origin), {
+    const answer = await fetch(relayed(new URL('/', origin)), {
         method: 'POST',
         headers: {
             'content-type': 'application/json',

package/dist/parts.js

@@ -0,0 +1,64 @@
+export class Parts {
+    parts = [];
+    context = null;
+    emit;
+    writing = null;
+    planned = null;
+    constructor(emit) {
+        this.emit = emit;
+    }
+    write(type, id, text) {
+        if (text === '')
+            return;
+        const last = this.parts.length - 1;
+        const part = this.parts[last];
+        if (this.writing?.type === type && this.writing.id === id && part?.type === type) {
+            part.text += text;
+            this.emit({ op: 'append', index: last, text });
+            return;
+        }
+        this.start({ type, text });
+        this.writing = { type, id };
+    }
+    command() {
+        const last = this.parts.length - 1;
+        const part = this.parts[last];
+        if (part?.type !== 'commands') {
+            this.start({ type: 'commands', count: 1 });
+            return;
+        }
+        part.count++;
+        this.emit({ op: 'count', index: last, count: part.count });
+    }
+    start(part) {
+        this.writing = null;
+        this.parts.push(part);
+        const index = this.parts.length - 1;
+        this.emit({ op: 'start', index, part });
+        return index;
+    }
+    done(index, result) {
+        const part = this.parts[index];
+        part.status = 'done';
+        part.result = result;
+        this.emit({ op: 'status', index, status: 'done', result });
+    }
+    plan(entries) {
+        if (this.planned === null) {
+            this.planned = this.start({ type: 'plan', entries });
+            return;
+        }
+        this.parts[this.planned].entries = entries;
+        this.emit({ op: 'plan', index: this.planned, entries });
+    }
+    measure(context) {
+        this.context = context;
+        this.emit({ op: 'context', ...context });
+    }
+    operations() {
+        return [
+            ...this.parts.map((part, index) => ({ op: 'start', index, part })),
+            ...(this.context === null ? [] : [{ op: 'context', ...this.context }]),
+        ];
+    }
+}

package/dist/refusals.js

@@ -21,6 +21,18 @@ function spoken(text) {
     const detail = said.indexOf('\n');
     return { code: head[1], text: said, conflicts: detail === -1 ? [] : conflictCodes(said.slice(detail + 1)) };
 }
+export function retryable(text) {
+    let body;
+    try {
+        body = JSON.parse(text);
+    }
+    catch {
+        return null;
+    }
+    const error = body?.error;
+    const verdict = error?.retryable ?? error?.data?.retryable;
+    return typeof verdict === 'boolean' ? verdict : null;
+}
 export function refusalOf(text) {
     let body;
     try {

package/dist/relay.js

@@ -0,0 +1,10 @@
+export function relayed(target) {
+    const url = new URL(target);
+    const relay = process.env.HOUSE_KIT_RELAY;
+    if (relay === undefined || relay === '')
+        return url;
+    const through = new URL(`${url.host}${url.pathname}${url.search}`, `${relay}/`);
+    if (url.protocol === 'wss:' || url.protocol === 'ws:')
+        through.protocol = 'wss:';
+    return through;
+}

package/dist/resident.js

@@ -1,34 +1,32 @@
 import { once } from 'node:events';
+import { watch } from 'node:fs';
 import { mkdir, rm, writeFile } from 'node:fs/promises';
 import { createServer } from 'node:http';
-import { extname, join } from 'node:path';
+import { dirname, extname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { killDescendants } from './acp.js';
 import { Agents } from './agents.js';
 import { house } from './api.js';
 import { received } from './bridge.js';
 import { Conversations } from './conversations.js';
 import { LocalCopies } from './copies.js';
-import { agentBase, kitHome, readEnrolment } from './home.js';
+import { agentBase, enrolled, kitHome } from './home.js';
+import { killDescendants } from './scope.js';
+import { quoted } from './shell.js';
 import { SignIns } from './sign-in.js';
 import { placeSkillSet } from './skills.js';
 import { holdStream } from './stream.js';
 import { Updates } from './update.js';
+import { codexLauncher } from './work.js';
 function report(error) {
     process.stderr.write(`kit: ${error instanceof Error ? error.message : String(error)}\n`);
 }
 function logged(work) {
     work.catch(report);
 }
-function quoted(value) {
-    return `'${value.replaceAll("'", `'\\''`)}'`;
-}
-async function installShim() {
-    const main = fileURLToPath(new URL(`./git-main${extname(fileURLToPath(import.meta.url))}`, import.meta.url));
-    await mkdir(join(kitHome(), 'shim'), { recursive: true });
-    await writeFile(join(kitHome(), 'shim', 'git'), `#!/bin/sh\nexec ${quoted(process.execPath)} ${quoted(main)} "$@"\n`, {
-        mode: 0o755,
-    });
+async function installShim(path, module) {
+    const main = fileURLToPath(new URL(`./${module}${extname(fileURLToPath(import.meta.url))}`, import.meta.url));
+    await mkdir(dirname(path), { recursive: true });
+    await writeFile(path, `#!/bin/sh\nexec ${quoted(process.execPath)} ${quoted(main)} "$@"\n`, { mode: 0o755 });
 }
 async function serveOwner(copies) {
     const socketPath = join(kitHome(), 'owner.sock');
@@ -50,19 +48,38 @@ async function serveOwner(copies) {
     server.listen(socketPath);
     await once(server, 'listening');
 }
+function connected() {
+    return new Promise((resolve) => {
+        const watcher = watch(kitHome(), () => {
+            if (!enrolled())
+                return;
+            watcher.close();
+            resolve();
+        });
+        if (!enrolled()) {
+            process.stderr.write('kit: this Environment is not connected; run kit login\n');
+            return;
+        }
+        watcher.close();
+        resolve();
+    });
+}
 export async function resident() {
-    if ((await readEnrolment()) === null) {
-        process.stderr.write('kit: this Environment is not enrolled; run kit login\n');
-        process.exitCode = 1;
-        return;
-    }
+    await connected();
+    watch(kitHome(), () => {
+        if (enrolled())
+            return;
+        killDescendants();
+        process.exit(1);
+    });
     await placeSkillSet();
     await mkdir(agentBase(), { recursive: true });
     process.env.HOUSE_KIT_RESIDENT = String(process.pid);
     const agents = new Agents(house);
     const copies = new LocalCopies(house);
     await copies.load();
-    await installShim();
+    await installShim(join(kitHome(), 'shim', 'git'), 'git-main');
+    await installShim(codexLauncher(), 'codex-main');
     await serveOwner(copies);
     let stream = null;
     let reported = false;
@@ -101,6 +118,8 @@ export async function resident() {
             logged(copies.select());
         },
         frame: (arrived) => {
+            if (arrived.type === 'watching')
+                conversations.watching(arrived.watching === true);
             if (arrived.type === 'work_available' && arrived.subject === 'agents')
                 logged(agents.refresh());
             if (arrived.type === 'work_available' && arrived.subject === 'local_copy')