@agentshouse/kit 0.2.1-cf669c6d1ecbb → 0.2.1-cf6a92e13f031

package/dist/home.js

@@ -1,15 +1,63 @@
-import { existsSync, linkSync, readFileSync, renameSync, rmSync } from 'node:fs';
+import { createHash, randomUUID } from 'node:crypto';
+import { accessSync, chmodSync, constants, existsSync, linkSync, lstatSync, mkdirSync, readFileSync, realpathSync, renameSync, rmSync } from 'node:fs';
 import { mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises';
-import { homedir } from 'node:os';
-import { join } from 'node:path';
+import { homedir, tmpdir } from 'node:os';
+import { join, resolve } from 'node:path';
 import { selectRelay } from './relay.js';
 const ENROLMENT = 'credential.json';
 const DISCONNECTED = 'disconnected.json';
 const CONFIGURATION = 'kit.json';
 const OWN_AGENT = 'own-agent.json';
 const RESTART = 'restart';
+let defaulted;
+function writable(directory) {
+    try {
+        accessSync(directory, constants.W_OK | constants.X_OK);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function privateDirectory(path) {
+    try {
+        mkdirSync(path, { mode: 0o700 });
+    }
+    catch (error) {
+        if (error.code !== 'EEXIST')
+            throw error;
+    }
+    const found = lstatSync(path);
+    if (found.isSymbolicLink())
+        throw new Error(`${path} is a symbolic link`);
+    if (!found.isDirectory())
+        throw new Error(`${path} is not a directory`);
+    if (found.uid !== process.geteuid())
+        throw new Error(`${path} is not owned by this User`);
+    chmodSync(path, 0o700);
+    return path;
+}
+function ownTemporaryHome() {
+    return privateDirectory(join(tmpdir(), `house-kit-${process.getuid()}`));
+}
+function defaultHome() {
+    const home = join(homedir(), '.house-kit');
+    return existsSync(home) || writable(homedir()) ? home : ownTemporaryHome();
+}
 export function kitHome() {
-    return process.env.HOUSE_KIT_HOME ?? join(homedir(), '.house-kit');
+    return process.env.HOUSE_KIT_HOME || (defaulted ??= defaultHome());
+}
+export function socketDirectory() {
+    const sockets = privateDirectory(join(realpathSync('/tmp'), `hk-${process.geteuid()}`));
+    const home = kitHome();
+    const physical = existsSync(home) ? realpathSync(home) : resolve(home);
+    return privateDirectory(join(sockets, createHash('sha256').update(physical).digest('hex').slice(0, 12)));
+}
+export function ownerSocket() {
+    return join(socketDirectory(), 'owner.sock');
+}
+export function ownerLock() {
+    return join(socketDirectory(), 'owner.lock');
 }
 export function workspaceRoot() {
     return process.env.HOUSE_KIT_WORKSPACE ?? '/agents/house';
@@ -30,7 +78,7 @@ export async function readHome(name) {
 export async function writeHome(name, value) {
     const home = kitHome();
     await mkdir(home, { recursive: true, mode: 0o700 });
-    const temporary = join(home, `${name}.${process.pid}`);
+    const temporary = join(home, `${name}.${randomUUID()}`);
     await writeFile(temporary, `${JSON.stringify(value)}\n`, { mode: 0o600 });
     await rename(temporary, join(home, name));
 }
@@ -47,6 +95,9 @@ export async function writeEnrolment(enrolment) {
 export function readDisconnected() {
     return readHome(DISCONNECTED);
 }
+export function forgetDisconnected() {
+    return rm(join(kitHome(), DISCONNECTED), { force: true });
+}
 export async function forgetEnrolment({ house, environment }) {
     await writeHome(DISCONNECTED, { house, environment });
     await rm(join(kitHome(), ENROLMENT), { force: true });

package/dist/house-cli.js

@@ -0,0 +1,286 @@
+import { createHash } from 'node:crypto';
+import { createReadStream } from 'node:fs';
+import { request, setGlobalProxyFromEnv } from 'node:http';
+import { request as httpsRequest } from 'node:https';
+import { extname, join, resolve } from 'node:path';
+import { Readable } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
+import { downloaded, inspectedFile, storeRefusal, uploaded } from './files.js';
+import { HOUSE_REF } from './git.js';
+import { ownerSocket, readOwnAgent } from './home.js';
+import { callHouse, rpc, UNREACHABLE, Unsettled } from './mcp.js';
+import { refusalOf, retryable } from './refusals.js';
+import { relayed, selectRelay } from './relay.js';
+import { parse } from 'yaml';
+const USAGE = "usage: house <tool> ['<arguments as JSON>']";
+const PUSH_USAGE = 'usage: house push [commit] [--owner]';
+const PUSH = "push [commit]: sends the Local copy's committed changes to House";
+const FETCH_USAGE = 'usage: house fetch';
+const FETCH = `fetch: records House's changes on each Local copy's ${HOUSE_REF}`;
+const DOWNLOAD_USAGE = `usage: house download '{"path":"/rooms/<handle>/<path>","file":"<local file>"}', adding "ref" for a revision`;
+const DOWNLOAD = 'download: writes a binary file of a Room to the local file named by file';
+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, or kit chatgpt --key <key> with a script key";
+const DISCONNECTED = "House no longer accepts this computer's own agent; run kit login, or kit chatgpt --key <key> with a script key";
+const UNCONFIRMED = 'with no result; a write may or may not have taken effect, so read before you repeat it';
+const socketPath = process.env.HOUSE_BRIDGE;
+const MEDIA_TYPES = new Map([
+    ['avif', 'image/avif'],
+    ['csv', 'text/csv'],
+    ['docx', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'],
+    ['gif', 'image/gif'],
+    ['heic', 'image/heic'],
+    ['html', 'text/html'],
+    ['jpeg', 'image/jpeg'],
+    ['jpg', 'image/jpeg'],
+    ['json', 'application/json'],
+    ['m4a', 'audio/mp4'],
+    ['md', 'text/markdown'],
+    ['mov', 'video/quicktime'],
+    ['mp3', 'audio/mpeg'],
+    ['mp4', 'video/mp4'],
+    ['ogg', 'audio/ogg'],
+    ['pdf', 'application/pdf'],
+    ['png', 'image/png'],
+    ['pptx', 'application/vnd.openxmlformats-officedocument.presentationml.presentation'],
+    ['svg', 'image/svg+xml'],
+    ['txt', 'text/plain'],
+    ['wav', 'audio/wav'],
+    ['webm', 'video/webm'],
+    ['webp', 'image/webp'],
+    ['xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'],
+    ['zip', 'application/zip'],
+]);
+function refused(path, status, text, local) {
+    const refusal = refusalOf(text);
+    if (refusal !== null)
+        return refusal.text;
+    if (status === 401)
+        return REVOKED;
+    if (status === 502 && local)
+        return text;
+    return path === '/' ? unconfirmed(status) : `${path} answered ${status}`;
+}
+function unconfirmed(status) {
+    return `House answered ${status} ${UNCONFIRMED}`;
+}
+function bridged(path, body, to = socketPath) {
+    return new Promise((resolve, reject) => {
+        const sent = request({ socketPath: to, path, method: 'POST', headers: { 'content-type': 'application/json' } }, (answer) => {
+            const chunks = [];
+            answer.on('data', (chunk) => chunks.push(chunk));
+            answer.on('end', () => {
+                const text = Buffer.concat(chunks).toString('utf8');
+                if (answer.statusCode === 200)
+                    resolve(text);
+                else
+                    reject(new Error(refused(path, answer.statusCode, text, answer.headers['content-type'] === undefined)));
+            });
+        });
+        sent.on('error', (error) => reject(new Error(error.code === 'EPERM' || error.code === 'EACCES' ? SANDBOXED : CLOSED)));
+        sent.end(JSON.stringify(body));
+    });
+}
+async function direct(message) {
+    const ownAgent = await readOwnAgent();
+    if (ownAgent === null)
+        throw new Error(UNCONNECTED);
+    selectRelay(process.env.HOUSE_KIT_RELAY || ownAgent.relay);
+    setGlobalProxyFromEnv();
+    const answer = await callHouse(ownAgent.house, ownAgent.credential, message).catch(() => {
+        throw new Unsettled(UNREACHABLE);
+    });
+    if (answer.status === 200)
+        return answer.text;
+    if (answer.status === 401)
+        throw new Error(DISCONNECTED);
+    const refusal = refusalOf(answer.text)?.text ?? unconfirmed(answer.status);
+    throw retryable(answer.text) === false ? new Error(refusal) : new Unsettled(refusal);
+}
+async function mcp(method, params) {
+    const message = rpc(method, params);
+    const answer = JSON.parse(socketPath === undefined ? await direct(message) : await bridged('/', message));
+    if (answer.error !== undefined)
+        throw new Error(answer.error.message);
+    return answer.result;
+}
+async function tools() {
+    return (await mcp('tools/list', {})).tools;
+}
+function unreadable(path, error) {
+    return new Error(error.code === 'EISDIR'
+        ? `${path} is a folder; upload one file at a time`
+        : `${path} is not a readable file`);
+}
+function opened(url, method, headers, body) {
+    return new Promise((answered, failed) => {
+        const local = socketPath !== undefined;
+        const target = local ? null : relayed(url);
+        if (!local)
+            setGlobalProxyFromEnv();
+        const sent = target === null
+            ? request({ socketPath, path: url, method, headers }, answered)
+            : (target.protocol === 'https:' ? httpsRequest : request)(target, { method, headers }, answered);
+        sent.on('error', (error) => failed(new Error(!local ? UNREACHABLE : error.code === 'EPERM' || error.code === 'EACCES' ? SANDBOXED : CLOSED)));
+        if (body === undefined)
+            sent.end();
+        else
+            pipeline(body, sent).catch(() => undefined);
+    });
+}
+async function sentPart(url, file, start, end) {
+    const answer = await opened(url, 'PUT', { 'content-length': String(end - start) }, end === start ? undefined : createReadStream(file, { start, end: end - 1 }));
+    await answer.toArray();
+    if (answer.statusCode !== 200)
+        throw storeRefusal('upload', answer.statusCode);
+}
+async function download(args) {
+    const { flags, positionals: [argument] } = accepted(args, ['--help'], 1, DOWNLOAD_USAGE);
+    if (flags.has('--help'))
+        return DOWNLOAD_USAGE;
+    const { file, ...selected } = argumentsOf(argument);
+    if (typeof file !== 'string' || file === '')
+        throw new Error('download needs "file", the local file to write');
+    const written = resolve(file);
+    await downloaded(async () => {
+        const file = inspectedFile(await called('inspect', selected));
+        if (file === null)
+            throw new Error(`${String(selected.path)} holds no binary file; shell reads its text`);
+        return file;
+    }, async (url) => {
+        const answer = await opened(url, 'GET', {});
+        return { status: answer.statusCode, body: answer };
+    }, written, String(selected.path));
+    return written;
+}
+async function described(file) {
+    const digest = createHash('sha256');
+    let bytes = 0;
+    try {
+        for await (const chunk of createReadStream(file)) {
+            digest.update(chunk);
+            bytes += chunk.length;
+        }
+    }
+    catch (error) {
+        throw unreadable(file, error);
+    }
+    const mediaType = MEDIA_TYPES.get(extname(file).slice(1).toLowerCase());
+    return { bytes, sha256: digest.digest('hex'), ...(mediaType === undefined ? {} : { media_type: mediaType }) };
+}
+async function finished(upload, room) {
+    const text = await called('upload', { upload, room_ref: room });
+    const answer = parse(text);
+    return answer !== null && ('upload' in answer || 'checking' in answer) ? answer : { text };
+}
+async function upload({ file, ...destination }) {
+    if (typeof file !== 'string' || file === '')
+        throw new Error('upload needs "file", a local file');
+    const description = await described(file);
+    const answer = await called('upload', { ...destination, ...description });
+    const declared = parse(answer);
+    if (declared?.upload === undefined)
+        return answer;
+    const accepted = await uploaded(declared.upload, {
+        bytes: description.bytes,
+        send: (url, start, end) => sentPart(url, file, start, end),
+        finish: (id) => finished(id, destination.room_ref),
+    });
+    return accepted.text;
+}
+function unexpected(argument, usage) {
+    return new Error(`unexpected argument ${argument}; ${usage}`);
+}
+function accepted(args, flags, positionals, usage) {
+    const given = { flags: new Set(), positionals: [] };
+    for (const arg of args) {
+        if (flags.includes(arg))
+            given.flags.add(arg);
+        else if (!arg.startsWith('-') && given.positionals.length < positionals)
+            given.positionals.push(arg);
+        else
+            throw unexpected(arg, usage);
+    }
+    return given;
+}
+async function push(args) {
+    const { flags, positionals: [commit = 'HEAD'] } = accepted(args, ['--help', '--owner'], 1, PUSH_USAGE);
+    if (flags.has('--help'))
+        return PUSH_USAGE;
+    const owner = flags.has('--owner');
+    if (owner && socketPath !== undefined)
+        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 push needs --owner');
+    const pushed = JSON.parse(await bridged('/git/push', { cwd: process.cwd(), commit }, owner ? ownerSocket() : socketPath));
+    if (pushed.refused)
+        throw new Error(pushed.text);
+    return pushed.text;
+}
+async function fetched(args) {
+    if (accepted(args, ['--help'], 0, FETCH_USAGE).flags.has('--help'))
+        return FETCH_USAGE;
+    const answer = JSON.parse(await bridged('/git/fetch', {}, socketPath ?? ownerSocket()));
+    if (answer.refused)
+        throw new Error(answer.text);
+    return answer.text;
+}
+function argumentsOf(argument) {
+    if (argument === undefined)
+        return {};
+    let parsed;
+    try {
+        parsed = JSON.parse(argument);
+    }
+    catch {
+        throw new Error(ARGUMENTS);
+    }
+    if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed))
+        throw new Error(ARGUMENTS);
+    return parsed;
+}
+async function house(args) {
+    const { flags, positionals: [verb, argument] } = accepted(args, ['--help'], 2, USAGE);
+    if (verb === 'help' && argument !== undefined)
+        throw unexpected(argument, USAGE);
+    if (flags.has('--help') && argument !== undefined)
+        throw unexpected('--help', USAGE);
+    if (verb === undefined || verb === 'help') {
+        return [USAGE, 'help', PUSH, FETCH, DOWNLOAD, ...(await tools()).map((tool) => (tool.description === undefined ? tool.name : `${tool.name}: ${tool.description}`))].join('\n');
+    }
+    if (flags.has('--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 === undefined ? [] : [tool.description]), JSON.stringify(tool.inputSchema)].join('\n');
+    }
+    const parsed = argumentsOf(argument);
+    return verb === 'upload' ? upload(parsed) : called(verb, parsed);
+}
+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);
+const named = argv.findIndex((arg) => !arg.startsWith('-'));
+const rest = argv.filter((_arg, index) => index !== named);
+(argv[named] === 'push'
+    ? push(rest)
+    : argv[named] === 'fetch'
+        ? fetched(rest)
+        : argv[named] === 'download'
+            ? download(rest)
+            : 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/house-main.js

@@ -1,192 +1,10 @@
 #!/usr/bin/env node
-import { createHash } from 'node:crypto';
-import { readFile } from 'node:fs/promises';
-import { request, setGlobalProxyFromEnv } from 'node:http';
-import { basename, join } from 'node:path';
-import { HOUSE_REF } from './git.js';
-import { kitHome, readEnrolment, 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 PUSH_USAGE = 'usage: house push [commit] [--owner]';
-const PUSH = "push [commit]: sends the Local copy's committed changes to House";
-const FETCH_USAGE = 'usage: house fetch';
-const FETCH = `fetch: records House's changes on each Local copy's ${HOUSE_REF}`;
-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";
-const socketPath = process.env.HOUSE_BRIDGE;
-function refused(path, status, text) {
-    const refusal = refusalOf(text);
-    if (refusal !== null)
-        return refusal.text;
-    if (status === 401)
-        return REVOKED;
-    if (URL.canParse(path))
-        return `the upload answered ${status}; upload the file again`;
-    if (status === 502 && /^[A-Za-z]/.test(text))
-        return text;
-    return `${path} answered ${status}`;
-}
-function bridged(path, body, headers = { 'content-type': 'application/json' }, to = socketPath) {
-    return new Promise((resolve, reject) => {
-        const sent = request({ socketPath: to, path, method: 'POST', headers }, (answer) => {
-            let text = '';
-            answer.setEncoding('utf8');
-            answer.on('data', (chunk) => {
-                text += chunk;
-            });
-            answer.on('end', () => {
-                if (answer.statusCode === 200)
-                    resolve(text);
-                else
-                    reject(new Error(refused(path, answer.statusCode, text)));
-            });
-        });
-        sent.on('error', (error) => reject(new Error(error.code === 'EPERM' || error.code === 'EACCES' ? SANDBOXED : CLOSED)));
-        sent.end(body instanceof Buffer ? body : JSON.stringify(body));
-    });
-}
-async function direct(message) {
-    const ownAgent = await readOwnAgent();
-    if (ownAgent === null)
-        throw new Error(UNCONNECTED);
-    await readEnrolment();
-    setGlobalProxyFromEnv();
-    const answer = await callHouse(ownAgent.house, ownAgent.credential, message).catch(() => {
-        throw new Error(UNREACHABLE);
-    });
-    if (answer.status === 200)
-        return answer.text;
-    throw new Error(answer.status === 401 ? DISCONNECTED : (refusalOf(answer.text)?.text ?? `House answered ${answer.status}`));
-}
-async function mcp(method, params) {
-    const message = rpc(method, params);
-    const answer = JSON.parse(socketPath === undefined ? await direct(message) : await bridged('/', message));
-    if (answer.error !== undefined)
-        throw new Error(answer.error.message);
-    return answer.result;
-}
-async function tools() {
-    return (await mcp('tools/list', {})).tools;
-}
-async function localFile(path) {
-    try {
-        return await readFile(path);
-    }
-    catch (error) {
-        throw new Error(error.code === 'EISDIR'
-            ? `${path} is a folder; upload one file at a time`
-            : `${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 = parse(await called('upload', {
-        ...(roomRef === undefined ? {} : { room_ref: roomRef }),
-        name: basename(path),
-        bytes: bytes.length,
-        sha256: createHash('sha256').update(bytes).digest('hex'),
-    }));
-    if (declared.upload === undefined)
-        return declared.attachment;
-    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 push(args) {
-    if (args.includes('--help'))
-        return PUSH_USAGE;
-    const owner = args.includes('--owner');
-    const commit = args.find((arg) => arg !== '--owner') ?? 'HEAD';
-    if (owner && socketPath !== undefined)
-        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 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);
-    return pushed.text;
-}
-async function fetched(args) {
-    if (args.includes('--help'))
-        return FETCH_USAGE;
-    const answer = JSON.parse(await bridged('/git/fetch', {}, undefined, socketPath ?? join(kitHome(), 'owner.sock')));
-    if (answer.refused)
-        throw new Error(answer.text);
-    return answer.text;
-}
-function argumentsOf(argument) {
-    if (argument === undefined)
-        return {};
-    let parsed;
-    try {
-        parsed = JSON.parse(argument);
-    }
-    catch {
-        throw new Error(ARGUMENTS);
-    }
-    if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed))
-        throw new Error(ARGUMENTS);
-    return parsed;
-}
-async function house([verb, argument]) {
-    if (verb === undefined || verb === '--help' || verb === 'help') {
-        return [USAGE, 'help', PUSH, FETCH, ...(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 === undefined ? [] : [tool.description]), JSON.stringify(tool.inputSchema)].join('\n');
-    }
-    const args = argumentsOf(argument);
-    if (verb === 'upload') {
-        return JSON.stringify({ attachment: await upload(args.path, args.room_ref, 'upload needs "path", a local file') });
-    }
-    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;
-    }
-    return called(verb, args);
+const [major = 0, minor = 0] = process.versions.node.split('.').map(Number);
+if (major < 24 || (major === 24 && minor < 14)) {
+    process.stderr.write(`house: the Kit needs Node 24.14.0 or newer; this is ${process.versions.node}\n`);
+    process.exitCode = 1;
 }
-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;
+else {
+    await import('./house-cli.js');
 }
-const argv = process.argv.slice(2);
-(argv[0] === 'push' ? push(argv.slice(1)) : argv[0] === 'fetch' ? fetched(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;
-});
+export {};

package/dist/instructions.js

@@ -1,10 +1,6 @@
+import { agentInstructions } from '@agentshouse/skills';
 import { HOUSE_REF } from './git.js';
-import { HOW_WE_WORK } from './skills.js';
-const SOURCE_LINE = "From House:";
-const HOUSE_LINE = "Work with House through the `house` CLI: run `house --help`, and `house find_command` for House's guides and formats.";
-const FILE_LINE = 'To give the User a file, upload it with `house upload` and link it; for an App, a Site or a website, follow `house find_command \'{"query":"app"}\'`. Never start a server.';
-const READ_LINE = "Optional per-Room instructions: `/rooms/private/rooms/<handle>/AGENTS.md`.";
-const COPIES_LINE = `House Local copies; before work run \`house fetch\` and rebase onto \`${HOUSE_REF}\`; after it commit, then \`house push\`:`;
+const HOW_WE_WORK = '/rooms/private/how-we-work.md';
 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: (.+)$/;
@@ -12,7 +8,7 @@ function cutOf(lines) {
     const cut = CUT.exec(lines[0] ?? '');
     return cut !== null && Buffer.byteLength(lines.slice(1).join('\n')) === Number(cut[1]) ? cut : null;
 }
-async function howWeWork(bridge) {
+async function readHowWeWork(bridge) {
     let document = '';
     for (let command = `cat ${HOW_WE_WORK}`; command !== undefined;) {
         const read = await bridge.tool('shell', { command });
@@ -28,9 +24,9 @@ async function howWeWork(bridge) {
         document += lines.slice(cut === null ? 0 : 1).join('\n');
         command = cut?.[2];
     }
-    return document.replace(/\n$/, '');
+    return document;
 }
 export async function instructions(bridge, base, copies) {
-    const lines = [SOURCE_LINE, HOUSE_LINE, FILE_LINE, READ_LINE, ...(copies.length === 0 ? [] : [COPIES_LINE, ...copies])];
-    return [lines.join('\n'), base, await howWeWork(bridge)].filter((part) => part !== '').join('\n\n');
+    const lines = agentInstructions(HOUSE_REF, copies);
+    return [lines.join('\n'), base, (await readHowWeWork(bridge)).replace(/\n$/, '')].filter((part) => part !== '').join('\n\n');
 }

package/dist/kit-cli.js

@@ -0,0 +1,68 @@
+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 the Kit process and ends your own agent's connection",
+            operands: 0,
+            run: logout,
+        },
+    ],
+    [
+        'resident',
+        {
+            usage: 'usage: kit resident',
+            about: "keeps this Environment connected; 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`);
+    process.exitCode = 1;
+});