@agentshouse/kit 0.2.1-c3e4a20bb3183 → 0.2.1-cb6679d048e60

package/README.md

@@ -6,17 +6,17 @@ through the agent CLIs you chose and gives each Agent the `house` command.
 
 ## Install
 
-Connect a computer from agents.house. It gives you the one command that
-installs House Kit on that computer and updates it when you run it again. On
-macOS and Linux it installs House Kit natively under your own account, without
-an admin password, as a service that runs while you are logged in. `kit` and
-`house` are then on your login shell's `PATH`, and your workspace is
-`~/AgentsHouse` unless you pass `--workspace <path>`.
+Run `curl -fsSL agents.house/kit | sh`, or `irm agents.house/kit.ps1 | iex` on
+Windows, and again to update; options follow `sh -s --`. On macOS and Linux it
+installs House Kit natively under your own account, without an admin password,
+as a service that runs while you are logged in. `kit` and `house` are then on
+your login shell's `PATH`, and your workspace is `~/AgentsHouse` unless you
+pass `--workspace <path>`.
 
 Add `--container` to run House Kit in one Docker container instead, with your
 workspace mounted at `/agents/house`; your Agents then reach only that
 workspace. On Windows 11 the container is the one choice. Append a `kit` or
-`house` command to the container's command to run it in that container.
+`house` command to the container's options to run it in that container.
 Running the command for the other choice on a connected computer asks you to
 confirm, then replaces its Environment, whose Agents end, with a new one.
 
@@ -24,14 +24,12 @@ On your own Ubuntu 26.04 server, run the Linux command with `--linux` to
 install House Kit natively, with its workspace at `/agents/house`; `kit` and
 `house` are then on the server's `PATH`.
 
-House Kit runs the agent CLIs your login shell finds and installs a missing
-one through that CLI's own installer. Running the command again offers to
-update each CLI older than House Kit needs; add `--update-clis` to update every
-one to its latest release without asking.
-
-House Kit also gives every Agent on the Environment a set of agent skills. Add
-`--no-skills` to the command to leave them out; running it again without the
-flag brings them back.
+House Kit runs the agent CLIs your login shell finds and installs a missing one
+through that CLI's own installer. Running the command again offers to update
+each CLI older than House Kit needs; add `--update-clis` to update every one to
+its latest release without asking. House Kit also gives every Agent on the
+Environment a set of agent skills. Add `--no-skills` to the command to leave
+them out; running it again without the flag brings them back.
 
 ## Commands
 
@@ -40,13 +38,15 @@ Environment's credential in `~/.house-kit`, or in `$HOUSE_KIT_HOME` when it is
 set. Pass `--manual` to paste the code by hand on a machine without a browser,
 and `--environment <id>` to reconnect an Environment you already have. It also
 connects your own agent: `house <tool>` run outside an Agent conversation calls
-House as you, until you revoke that connection on Connections.
+House as you, until you revoke that connection on Connections. `house help`
+lists the Tools. `kit logout` disconnects this computer and stops House Kit; a
+later `kit login` reconnects the same Environment.
 
 `kit resident` keeps the Environment connected, and keeps the Rooms you chose
 for this Environment as Git repositories under `local-copies` in the
-workspace. Commit in one and run `house git push --owner` there to send the
+workspace. Commit in one and run `house push --owner` there to send the
 commit to House; in the container, run it through the install command from the
-copy's directory. Inside an Agent conversation the Agent runs `house git push`.
+copy's directory. Inside an Agent conversation the Agent runs `house push`.
 
 House Kit turns each audio file of your message to an Agent into text on this
 computer before the Agent reads the message. The first audio file downloads the

package/dist/bootstrap.json

@@ -1,30 +1,23 @@
 {
-  "schemaVersion": 1,
-  "version": "0.2.1-c3e4a20bb3183",
+  "schemaVersion": 2,
+  "version": "0.2.1-cb6679d048e60",
   "hosts": {
+    "macos": {
+      "asset": {
+        "name": "connect-linux.sh",
+        "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-cb6679d048e60/connect-linux.sh"
+      }
+    },
     "linux": {
-      "command": "bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.2.1-c3e4a20bb3183/connect-linux.sh)",
       "asset": {
         "name": "connect-linux.sh",
-        "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-c3e4a20bb3183/connect-linux.sh"
-      },
-      "workspace": {
-        "argument": "--workspace",
-        "quoting": "posix"
-      },
-      "container": {
-        "argument": "--container"
+        "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-cb6679d048e60/connect-linux.sh"
       }
     },
     "windows": {
-      "command": "& ([scriptblock]::Create((irm https://github.com/agentshouse/kit/releases/download/v0.2.1-c3e4a20bb3183/connect-windows.ps1)))",
       "asset": {
         "name": "connect-windows.ps1",
-        "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-c3e4a20bb3183/connect-windows.ps1"
-      },
-      "workspace": {
-        "argument": "--workspace",
-        "quoting": "powershell"
+        "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-cb6679d048e60/connect-windows.ps1"
       }
     }
   }

package/dist/copies.js

@@ -255,11 +255,11 @@ export class LocalCopies {
     async push(cwd, selector, caller) {
         const located = await run(cwd, ['rev-parse', '--path-format=absolute', '--git-common-dir', '--show-toplevel']);
         if (located.status !== 0)
-            return { refused: true, text: `${cwd} is not a House Local copy; run house git push inside one` };
+            return { refused: true, text: `${cwd} is not a House Local copy; run house push inside one` };
         const [common, worktree] = located.stdout.toString('utf8').split('\n');
         const key = await this.keyAt(dirname(common));
         if (key === undefined)
-            return { refused: true, text: `${worktree} is not a House Local copy; run house git push inside one` };
+            return { refused: true, text: `${worktree} is not a House Local copy; run house push inside one` };
         return this.exclusive(key, () => this.pushed(key, worktree, selector, caller));
     }
     async keyAt(repository) {
@@ -597,7 +597,7 @@ export class LocalCopies {
             const refusal = error instanceof HouseRefusal ? refusalOf(error.text) : null;
             return {
                 refused: true,
-                text: refusal?.text ?? `House's answer to ${short(push.commit)} did not arrive; run house git push again`,
+                text: refusal?.text ?? `House's answer to ${short(push.commit)} did not arrive; run house push again`,
             };
         }
         if ('refused' in outcome) {
@@ -636,7 +636,7 @@ export class LocalCopies {
             await this.save(without(current));
             return {
                 refused: true,
-                text: `House does not hold ${short(push.commit)}; run house git push again`,
+                text: `House does not hold ${short(push.commit)}; run house push again`,
             };
         }
         const written = [];
@@ -664,7 +664,7 @@ export class LocalCopies {
         catch {
             return {
                 refused: false,
-                text: `House accepted ${short(commit)}; run house git push again to finish integrating it here`,
+                text: `House accepted ${short(commit)}; run house push again to finish integrating it here`,
             };
         }
     }

package/dist/home.js

@@ -1,7 +1,9 @@
+import { existsSync } from 'node:fs';
 import { mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 const ENROLMENT = 'credential.json';
+const DISCONNECTED = 'disconnected.json';
 const CONFIGURATION = 'kit.json';
 const OWN_AGENT = 'own-agent.json';
 export function kitHome() {
@@ -33,8 +35,19 @@ export async function writeHome(name, value) {
 export function readEnrolment() {
     return readHome(ENROLMENT);
 }
-export function writeEnrolment(enrolment) {
-    return writeHome(ENROLMENT, enrolment);
+export async function writeEnrolment(enrolment) {
+    await writeHome(ENROLMENT, enrolment);
+    await rm(join(kitHome(), DISCONNECTED), { force: true });
+}
+export function readDisconnected() {
+    return readHome(DISCONNECTED);
+}
+export async function forgetEnrolment({ house, environment }) {
+    await writeHome(DISCONNECTED, { house, environment });
+    await rm(join(kitHome(), ENROLMENT), { force: true });
+}
+export function enrolled() {
+    return existsSync(join(kitHome(), ENROLMENT));
 }
 export function readOwnAgent() {
     return readHome(OWN_AGENT);

package/dist/house-main.js

@@ -7,7 +7,8 @@ import { kitHome, readOwnAgent } from './home.js';
 import { callHouse, rpc, UNREACHABLE } from './mcp.js';
 import { refusalOf } from './refusals.js';
 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 REVOKED = 'this conversation no longer has House access; nothing to do from here';
@@ -97,17 +98,15 @@ async function upload(path, roomRef, missing) {
         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,14 +127,14 @@ 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') {
@@ -155,7 +154,7 @@ async function house([verb, argument]) {
     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`);
 }, (error) => {
     process.stderr.write(`house: ${error instanceof Error ? error.message : String(error)}\n`);

package/dist/instructions.js

@@ -2,7 +2,7 @@ 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 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,18 @@
 #!/usr/bin/env node
 import { setGlobalProxyFromEnv } from 'node:http';
 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');
+    process.stderr.write('usage: kit <login|logout|resident>\n');
     process.exitCode = 2;
 }
 run().catch((error) => {

package/dist/login.js

@@ -4,7 +4,7 @@ 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 { forgetOwnAgent, readDisconnected, readEnrolment, readOwnAgent, writeEnrolment, writeOwnAgent } from './home.js';
 import { callHouse, rpc } from './mcp.js';
 const DEFAULT_HOUSE = 'https://agents.house';
 function listen() {
@@ -78,7 +78,7 @@ export async function login(argv) {
             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;

package/dist/logout.js

@@ -0,0 +1,18 @@
+import { HouseRefusal, post } from './api.js';
+import { forgetEnrolment, readEnrolment } from './home.js';
+export async function logout() {
+    const enrolled = await readEnrolment();
+    if (enrolled === null) {
+        process.stdout.write('This computer is not connected to House.\n');
+        return;
+    }
+    try {
+        await post(enrolled.house, '/kit/logout', {}, enrolled.credential);
+    }
+    catch (error) {
+        if (!(error instanceof HouseRefusal && error.status === 401))
+            throw error;
+    }
+    await forgetEnrolment(enrolled);
+    process.stdout.write(`Environment ${enrolled.environment} is disconnected; kit login reconnects it.\n`);
+}

package/dist/resident.js

@@ -1,4 +1,5 @@
 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';
@@ -9,7 +10,7 @@ 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 { SignIns } from './sign-in.js';
 import { placeSkillSet } from './skills.js';
 import { holdStream } from './stream.js';
@@ -50,12 +51,30 @@ 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);

package/package.json

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