@agentshouse/kit 0.2.1-c7252abc8a583 → 0.2.1-c8179f06883b6

package/README.md

@@ -35,14 +35,14 @@ them out; running it again without the flag brings them back.
 or another, continues on its own and keeps the Environment's credential in
 `~/.house-kit`, or in `$HOUSE_KIT_HOME` when it is set. `--environment <id>`
 reconnects an Environment you already have; `--rooms <ref>[,<ref>...]` gives it
-only those Rooms and `--no-private` every Room but your Private Room;
-`--code <code>` connects immediately without a link.
+only those Rooms and `--no-private` every Room but your Private Room; `--code <code>` connects immediately without a link.
 A login also connects your own agent: outside an Agent conversation, `house <tool>` calls
 House as you and `git` clones and pushes your Apps at `<house>/app/` as you, until you revoke
 that connection on Connections. `house help` lists the Tools. Codex sessions started after a
 login run a lone `house` command outside their sandbox. `kit logout` disconnects this
 computer, stops House Kit and ends your own agent's connection, so `house` and `git` no
 longer act as you here; a later `kit login` reconnects the same Environment.
+`kit codex --key <key>` starts Codex with `house` acting as you through a key made on Connections; next time, just `kit codex`.
 
 `kit resident` keeps the Environment connected and, as it connects, copies each
 Room you chose for it as a Git repository in the workspace's `local-copies`.

package/dist/bootstrap.json

@@ -1,23 +1,23 @@
 {
   "schemaVersion": 2,
-  "version": "0.2.1-c7252abc8a583",
+  "version": "0.2.1-c8179f06883b6",
   "hosts": {
     "macos": {
       "asset": {
         "name": "connect-linux.sh",
-        "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-c7252abc8a583/connect-linux.sh"
+        "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-c8179f06883b6/connect-linux.sh"
       }
     },
     "linux": {
       "asset": {
         "name": "connect-linux.sh",
-        "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-c7252abc8a583/connect-linux.sh"
+        "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-c8179f06883b6/connect-linux.sh"
       }
     },
     "windows": {
       "asset": {
         "name": "connect-windows.ps1",
-        "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-c7252abc8a583/connect-windows.ps1"
+        "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-c8179f06883b6/connect-windows.ps1"
       }
     }
   }

package/dist/clis.js

@@ -2,7 +2,7 @@ import { spawn } from 'node:child_process';
 import { constants, readFileSync } from 'node:fs';
 import { access, mkdir, readFile, rename, writeFile } from 'node:fs/promises';
 import { homedir, userInfo } from 'node:os';
-import { delimiter, isAbsolute, join } from 'node:path';
+import { delimiter, dirname, isAbsolute, join } from 'node:path';
 import { kitHome } from './home.js';
 const HOUSE_EXECUTABLES = /^host_executable\(name = "house", paths = (\[.*\])\)$/m;
 function houseRule(houses) {
@@ -17,7 +17,7 @@ const RAW_SUBTYPES = [
     'hook_started',
     'hook_response',
 ];
-async function executable(path) {
+export async function executable(path) {
     try {
         await access(path, constants.X_OK);
         return true;
@@ -224,6 +224,12 @@ export async function loginPath() {
     const ran = await inLoginShell(`printf "${marker}%s\\n" "$PATH"`);
     return ran.stdout.split('\n').findLast((line) => line.startsWith(marker)).slice(marker.length);
 }
+export async function writeCodexRule() {
+    const shell = await loginPath().catch(() => '');
+    await allowHouseInCodex([dirname(process.execPath), process.env.PATH ?? '', shell].join(delimiter)).catch((error) => {
+        throw new Error(`Codex's rule for house could not be written: ${error.message}`);
+    });
+}
 export async function versionOf(path, signal) {
     return VERSION.exec((await run(path, ['--version'], READ_MS, false, signal)).stdout)?.[0] ?? null;
 }

package/dist/codex.js

@@ -0,0 +1,61 @@
+import { homedir } from 'node:os';
+import { delimiter, join, resolve } from 'node:path';
+import { parseArgs } from 'node:util';
+import { CLIS, executable, writeCodexRule } from './clis.js';
+import { kitHome, readOwnAgent, writeOwnAgent } from './home.js';
+import { accepted, DEFAULT_HOUSE } from './login.js';
+const USAGE = `usage: kit codex [--key <key>] [--house <origin>] [<codex argument>...]
+  --key <key>       a key from New key for a script on Connections, kept for later runs
+  --house <origin>  the House of the key, ${DEFAULT_HOUSE} unless one is stored
+`;
+const VALUED = ['--key', '--house'];
+const KEY_SOURCE = 'New key for a script on Connections';
+function codexArgumentsStart(argv) {
+    let index = 0;
+    while (index < argv.length) {
+        const arg = argv[index];
+        if (VALUED.includes(arg))
+            index += 2;
+        else if (arg === '--help' || VALUED.some((option) => arg.startsWith(`${option}=`)))
+            index += 1;
+        else
+            break;
+    }
+    return index;
+}
+async function onPath(name) {
+    for (const directory of (process.env.PATH ?? '').split(delimiter)) {
+        const path = resolve(directory, name);
+        if (await executable(path))
+            return path;
+    }
+    throw new Error(`${name} is not on your PATH; install it with ${CLIS['codex-acp'].install}`);
+}
+export async function codex(argv) {
+    const start = codexArgumentsStart(argv);
+    const { values } = parseArgs({
+        args: argv.slice(0, start),
+        options: { key: { type: 'string' }, house: { type: 'string' }, help: { type: 'boolean', default: false } },
+    });
+    if (values.help) {
+        process.stdout.write(USAGE);
+        return;
+    }
+    process.env.HOUSE_KIT_HOME = resolve(process.env.HOUSE_KIT_HOME || join(homedir(), '.house-kit-outside'));
+    const stored = await readOwnAgent();
+    if (values.key !== undefined) {
+        const house = values.house ?? stored?.house ?? DEFAULT_HOUSE;
+        if (!(await accepted(house, values.key)))
+            throw new Error(`${house} does not accept this key; pass one from ${KEY_SOURCE}`);
+        await writeOwnAgent({ house, credential: values.key });
+    }
+    else if (values.house !== undefined) {
+        throw new Error('--house names the House of a --key; pass the key with it');
+    }
+    else if (stored === null) {
+        throw new Error(`${kitHome()} holds no House key; pass --key with one from ${KEY_SOURCE}`);
+    }
+    await writeCodexRule();
+    const path = await onPath('codex');
+    process.execve(path, [path, ...argv.slice(start)], process.env);
+}

package/dist/kit-main.js

@@ -2,10 +2,11 @@
 import { setGlobalProxyFromEnv } from 'node:http';
 import { parseArgs } from 'node:util';
 import { answerGitCredential } from './app-git.js';
+import { codex } from './codex.js';
 import { login } from './login.js';
 import { logout } from './logout.js';
 import { resident } from './resident.js';
-const USAGE = 'usage: kit <login|logout|resident>\n';
+const USAGE = 'usage: kit <login|logout|resident|codex>\n';
 const COMMANDS = new Map([
     [
         'logout',
@@ -40,6 +41,8 @@ setGlobalProxyFromEnv();
 async function run() {
     if (command === 'login')
         return login(argv);
+    if (command === 'codex')
+        return codex(argv);
     if (command === '--help') {
         parseArgs({ args: argv });
         process.stdout.write(USAGE);

package/dist/login.js

@@ -1,17 +1,16 @@
 import { spawn } from 'node:child_process';
 import { createHash, randomBytes } from 'node:crypto';
 import { hostname } from 'node:os';
-import { delimiter, dirname } from 'node:path';
 import { parseArgs } from 'node:util';
 import { post, retrying } from './api.js';
 import { placeAppGit } from './app-git.js';
-import { allowHouseInCodex, loginPath } from './clis.js';
+import { writeCodexRule } from './clis.js';
 import { forgetOwnAgent, readDisconnected, readEnrolment, readOwnAgent, writeEnrolment, writeOwnAgent } from './home.js';
 import { callHouse, rpc } from './mcp.js';
 import { selectRelay } from './relay.js';
 import { startService } from './service.js';
 import { placeSkillSet } from './skills.js';
-const DEFAULT_HOUSE = 'https://agents.house';
+export const DEFAULT_HOUSE = 'https://agents.house';
 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;
@@ -20,7 +19,7 @@ function open(link) {
         .on('error', () => undefined)
         .unref();
 }
-async function accepted(house, credential) {
+export async function accepted(house, credential) {
     const checked = await callHouse(house, credential, rpc('tools/list', {}));
     if (checked.status === 200)
         return true;
@@ -103,13 +102,7 @@ export async function login(argv) {
     catch (error) {
         process.stderr.write(`kit: the skills could not be placed: ${error.message}\n`);
     }
-    try {
-        const shell = await loginPath().catch(() => '');
-        await allowHouseInCodex([dirname(process.execPath), process.env.PATH ?? '', shell].join(delimiter));
-    }
-    catch (error) {
-        process.stderr.write(`kit: Codex's rule for house could not be written: ${error.message}\n`);
-    }
+    await writeCodexRule().catch((error) => process.stderr.write(`kit: ${error.message}\n`));
     await writeEnrolment({
         house,
         ...(relay === undefined ? {} : { relay }),

package/package.json

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