@agentshouse/kit 0.2.1-alpha.9 → 0.2.1-c14f8446ba284

package/dist/resident.js

@@ -1,33 +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 { WorkingCopies } from './copies.js';
-import { kitHome, readEnrolment } from './home.js';
+import { LocalCopies } from './copies.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');
@@ -49,18 +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 WorkingCopies(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;
@@ -82,6 +101,7 @@ export async function resident() {
         changed,
     });
     const signIns = new SignIns(house, agents, changed);
+    const updates = new Updates(house);
     for (const signal of ['SIGTERM', 'SIGINT']) {
         process.once(signal, () => {
             killDescendants();
@@ -89,6 +109,7 @@ export async function resident() {
         });
     }
     await house.deliver('/kit/restarted', {}).catch(report);
+    await updates.resumed().catch(report);
     logged(agents.refresh());
     stream = holdStream({
         opened: () => {
@@ -97,9 +118,11 @@ 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 === 'working_copy')
+            if (arrived.type === 'work_available' && arrived.subject === 'local_copy')
                 logged(copies.select());
             if (arrived.type === 'entries') {
                 copies.entries(arrived);
@@ -108,6 +131,8 @@ export async function resident() {
                 reported = false;
                 if (arrived.kind === 'sign_in')
                     signIns.start(arrived);
+                else if (arrived.kind === 'update')
+                    updates.start(arrived);
                 else
                     conversations.input(arrived);
             }

package/dist/scope.js

@@ -0,0 +1,203 @@
+import { execFileSync } from 'node:child_process';
+import { mkdirSync, readdirSync, readFileSync, rmdirSync, statSync, writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+const LISTING_BYTES = 1 << 28;
+const CGROUPS = '/sys/fs/cgroup';
+const GONE = new Set(['ENOENT', 'ESRCH']);
+function failure(error) {
+    return error.code ?? '';
+}
+function listed(environment) {
+    const found = new Map();
+    const output = execFileSync('ps', [environment ? '-AEww' : '-Aww', '-o', 'pid=,ppid=,sess=,command='], {
+        encoding: 'utf8',
+        maxBuffer: LISTING_BYTES,
+    });
+    for (const line of output.split('\n')) {
+        const fields = /^\s*(\d+)\s+(\d+)\s+(\S+)\s?(.*)$/.exec(line);
+        if (fields !== null)
+            found.set(Number(fields[1]), { parent: Number(fields[2]), session: fields[3], command: fields[4] });
+    }
+    return found;
+}
+function read(pid) {
+    try {
+        const stat = readFileSync(`/proc/${pid}/stat`, 'utf8');
+        const fields = stat.slice(stat.lastIndexOf(')') + 2).split(' ');
+        const command = readFileSync(`/proc/${pid}/cmdline`, 'utf8').replaceAll('\0', ' ');
+        return { parent: Number(fields[1]), session: fields[3], command };
+    }
+    catch (error) {
+        if (GONE.has(failure(error)))
+            return null;
+        throw error;
+    }
+}
+function processes() {
+    if (process.platform === 'darwin')
+        return listed(false);
+    const found = new Map();
+    for (const entry of readdirSync('/proc')) {
+        const running = /^\d+$/.test(entry) ? read(entry) : null;
+        if (running !== null)
+            found.set(Number(entry), running);
+    }
+    return found;
+}
+function descendants(roots, table = processes()) {
+    const children = new Map();
+    for (const [pid, { parent }] of table)
+        children.set(parent, [...(children.get(parent) ?? []), pid]);
+    const tree = [];
+    const pending = roots.flatMap((root) => children.get(root) ?? []);
+    while (pending.length > 0) {
+        const pid = pending.pop();
+        tree.push(pid);
+        pending.push(...(children.get(pid) ?? []));
+    }
+    return tree;
+}
+function marked(marker, doubted) {
+    if (process.platform === 'darwin') {
+        return [...listed(true)].filter(([, { command }]) => ` ${command} `.includes(` ${marker} `)).map(([pid]) => pid);
+    }
+    return readdirSync('/proc')
+        .filter((entry) => /^\d+$/.test(entry) && carries(entry, marker, doubted))
+        .map(Number);
+}
+function carries(pid, marker, doubted) {
+    try {
+        return readFileSync(`/proc/${pid}/environ`, 'utf8').split('\0').includes(marker);
+    }
+    catch (error) {
+        if (GONE.has(failure(error)))
+            return false;
+        if (failure(error) !== 'EACCES')
+            throw error;
+        return doubted && statSync(`/proc/${pid}`, { throwIfNoEntry: false })?.uid === process.getuid();
+    }
+}
+function killAll(pids) {
+    for (const pid of pids) {
+        for (const target of [-pid, pid]) {
+            try {
+                process.kill(target, 'SIGKILL');
+            }
+            catch { }
+        }
+    }
+}
+export function killTree(child) {
+    killAll([child.pid, ...descendants([child.pid])]);
+}
+export function killMarked(marker) {
+    const pids = marked(marker, false);
+    killAll([...pids, ...descendants(pids)]);
+}
+export function killDescendants() {
+    const pids = marked(`HOUSE_KIT_RESIDENT=${process.pid}`, false);
+    killAll([...pids, ...descendants([process.pid, ...pids])]);
+}
+function ownGroup() {
+    if (process.platform !== 'linux')
+        return null;
+    try {
+        const line = readFileSync('/proc/self/cgroup', 'utf8')
+            .split('\n')
+            .find((entry) => entry.startsWith('0::'));
+        return line === undefined ? null : join(CGROUPS, line.slice(3));
+    }
+    catch {
+        return null;
+    }
+}
+function members(group) {
+    const pids = readFileSync(join(group, 'cgroup.procs'), 'utf8').split('\n').filter(Boolean).map(Number);
+    for (const entry of readdirSync(group, { withFileTypes: true })) {
+        if (entry.isDirectory())
+            pids.push(...members(join(group, entry.name)));
+    }
+    return pids;
+}
+export class Scope {
+    marker;
+    cli;
+    group;
+    session = null;
+    recorded = null;
+    constructor(marker, name, cli) {
+        this.marker = marker;
+        this.cli = cli;
+        const own = ownGroup();
+        this.group = own === null ? null : join(own, name);
+        try {
+            if (this.group !== null)
+                mkdirSync(this.group);
+        }
+        catch {
+            this.group = null;
+        }
+    }
+    command(command, args) {
+        if (this.group === null)
+            return [command, args];
+        return ['/bin/sh', ['-c', 'echo $$ > "$0/cgroup.procs" 2>/dev/null; exec "$@"', this.group, command, ...args]];
+    }
+    entered(pid) {
+        this.session = process.platform === 'darwin' ? (listed(false).get(pid)?.session ?? null) : String(pid);
+        if (this.group === null)
+            return;
+        const joined = readFileSync(`/proc/${pid}/cgroup`, 'utf8').split('\n').find((entry) => entry.startsWith('0::'));
+        if (joined !== undefined && join(CGROUPS, joined.slice(3)) === this.group)
+            return;
+        this.close();
+        this.group = null;
+    }
+    record() {
+        const found = this.found();
+        if (found === null)
+            return;
+        this.recorded = new Set([...found].filter(([, { session }]) => session === this.session).map(([pid]) => pid));
+    }
+    working() {
+        const found = this.found();
+        if (found === null)
+            return true;
+        if (this.recorded === null)
+            return found.size > 0;
+        return [...found].some(([pid, { session, command }]) => session !== this.session || !(this.recorded.has(pid) || command.startsWith(`${this.cli}-`)));
+    }
+    empty() {
+        return this.found()?.size === 0;
+    }
+    kill() {
+        killMarked(this.marker);
+        if (this.group === null)
+            return;
+        try {
+            writeFileSync(join(this.group, 'cgroup.kill'), '1');
+        }
+        catch {
+            killAll([...(this.found()?.keys() ?? [])]);
+        }
+    }
+    close() {
+        if (this.group === null)
+            return;
+        try {
+            rmdirSync(this.group);
+        }
+        catch { }
+    }
+    found() {
+        try {
+            const table = processes();
+            const roots = this.group === null ? marked(this.marker, true) : members(this.group);
+            const pids = this.group === null ? [...roots, ...descendants(roots, table)] : roots;
+            return new Map(pids.flatMap((pid) => (table.has(pid) ? [[pid, table.get(pid)]] : [])));
+        }
+        catch {
+            return null;
+        }
+    }
+}

package/dist/secret-input.js

@@ -1,15 +1,20 @@
+import { finalRefusal, retryDelay } from './api.js';
 export async function holdSecretInput(house, subject, steps, waiting) {
-    while (waiting()) {
+    for (let failures = 0; waiting();) {
         try {
             const held = await house.post(`/kit/secret-input/${subject}`, { steps });
             if (held.outcome === 'collected')
                 return held.content;
             if (held.release !== 'held')
                 return null;
+            failures = 0;
         }
         catch (error) {
+            if (finalRefusal(error))
+                return null;
             process.stderr.write(`kit: ${error instanceof Error ? error.message : String(error)}\n`);
-            await new Promise((resolve) => setTimeout(resolve, 1000));
+            // A wait that did not reach House is held again on the jittered curve for as long as its asker still waits.
+            await new Promise((resolve) => setTimeout(resolve, retryDelay(failures++)));
         }
     }
     return null;

package/dist/shell.js

@@ -0,0 +1,3 @@
+export function quoted(value) {
+    return `'${value.replaceAll("'", `'\\''`)}'`;
+}

package/dist/sign-in.js

@@ -1,13 +1,19 @@
 import { spawn } from 'node:child_process';
 import { createInterface } from 'node:readline';
-import { killTree } from './acp.js';
-import { CLIS, cliCommand, withoutProxy } from './clis.js';
+import { CLIS, withoutProxy } from './clis.js';
+import { killTree } from './scope.js';
 import { holdSecretInput } from './secret-input.js';
 const ESCAPE = /\u001b\[[\d;]*m/g;
 const LINK = /https:\/\/\S+/;
 const CODE = /^[A-Z0-9]+-[A-Z0-9]+$/;
+function causeOf(error) {
+    return error instanceof Error ? error.message : String(error);
+}
 function logged(error) {
-    process.stderr.write(`kit: ${error instanceof Error ? error.message : String(error)}\n`);
+    process.stderr.write(`kit: ${causeOf(error)}\n`);
+}
+function endOf(signal) {
+    return new Promise((resolve) => signal.addEventListener('abort', () => resolve(true), { once: true }));
 }
 export class SignIns {
     house;
@@ -27,24 +33,52 @@ export class SignIns {
             return;
         this.running.add(input.input_id);
         this.changed();
-        this.login(input)
-            .then(() => this.agents.report())
-            .then(() => this.house.deliver(`/kit/inputs/${input.input_id}/ack`, {}))
+        this.signIn(input)
             .catch(logged)
             .finally(() => {
             this.running.delete(input.input_id);
             this.changed();
         });
     }
-    async login(input) {
-        await this.agents.installed();
+    async signIn(input) {
+        const ending = new AbortController();
+        // House stops waiting for a sign-in ten minutes after it wrote it and sends the seconds left, so its install and login end with the page.
+        const timer = setTimeout(() => ending.abort(), input.ends_in * 1000);
+        const ended = await Promise.race([this.signedIn(input, ending.signal), endOf(ending.signal)]);
+        clearTimeout(timer);
+        if (ended)
+            process.stderr.write(`kit: the ${input.cli} sign-in reached the end House set for it\n`);
+        await this.house.deliver(`/kit/inputs/${input.input_id}/ack`, {});
+        if (!ended)
+            await this.agents.reread(input.cli);
+    }
+    async signedIn(input, signal) {
+        await this.login(input, signal);
+        if (!signal.aborted)
+            await this.agents.recheck(input.cli, signal);
+        return false;
+    }
+    async login(input, signal) {
+        let cli;
+        try {
+            cli = await this.agents.located(input.cli, signal);
+        }
+        catch (error) {
+            if (!signal.aborted)
+                process.stderr.write(`kit: the ${input.cli} sign-in failed: ${causeOf(error)}\n`);
+            return;
+        }
+        if (signal.aborted)
+            return;
         const login = CLIS[input.cli].login;
-        const child = spawn(cliCommand(input.cli), login.args, {
+        const child = spawn(cli, login.args, {
             stdio: ['pipe', 'pipe', 'pipe'],
             detached: true,
             env: withoutProxy(),
         });
         const running = () => child.exitCode === null && child.signalCode === null;
+        const stop = () => killTree(child);
+        signal.addEventListener('abort', stop, { once: true });
         let link;
         let code;
         let last = '';
@@ -54,6 +88,8 @@ export class SignIns {
             if (plain === '')
                 return;
             last = plain;
+            if (login.code === 'collect' && plain.includes(login.rejected))
+                killTree(child);
             link ??= LINK.exec(plain)?.[0];
             if (CODE.test(plain))
                 code ??= plain;
@@ -79,9 +115,10 @@ export class SignIns {
             createInterface({ input: output }).on('line', read);
         const failed = await new Promise((resolve) => {
             child.on('error', (error) => resolve(error.message));
-            child.on('close', (status, signal) => resolve(status === 0 ? null : `exited with ${status ?? signal}${last ? `: ${last}` : ''}`));
+            child.on('close', (status, killed) => resolve(status === 0 ? null : `exited with ${status ?? killed}${last ? `: ${last}` : ''}`));
         });
-        if (failed !== null)
+        signal.removeEventListener('abort', stop);
+        if (failed !== null && !signal.aborted)
             process.stderr.write(`kit: the ${input.cli} sign-in failed: ${failed}\n`);
     }
 }

package/dist/skills.js

@@ -3,11 +3,10 @@ import { cp, lstat, mkdir, readdir, realpath, rm, symlink, writeFile } from 'nod
 import { homedir } from 'node:os';
 import { join, relative } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { parse } from 'yaml';
 import { KIT_VERSION } from './clis.js';
-import { refusalCode } from './copies.js';
 import { kitHome, readConfiguration, readHome, writeHome } from './home.js';
-export const HOW_WE_WORK = '/private/library/how-we-work.md';
+import { refusalOf } from './refusals.js';
+export const HOW_WE_WORK = '/rooms/private/how-we-work.md';
 const SKILL_SET = fileURLToPath(new URL('../skills/', import.meta.url));
 const HOW_WE_WORK_TEXT = readFileSync(new URL('../how-we-work.md', import.meta.url), 'utf8');
 const RECORD = 'skill-set.json';
@@ -63,20 +62,16 @@ export async function placeSkillSet() {
     else
         await rm(join(kitHome(), RECORD), { force: true });
 }
-function documentPresent(refusal) {
-    const { conflicts } = parse(refusal.slice(refusal.indexOf('\n') + 1));
-    return conflicts.some((conflict) => conflict.code === 'path_exists');
-}
 export async function createHowWeWork(bridge) {
     if ((await readHome(RECORD)) === null || (await present(join(kitHome(), CREATED))))
         return;
     const created = await bridge.tool('edit', { changes: [{ op: 'create', path: HOW_WE_WORK, content: HOW_WE_WORK_TEXT }] });
     if (created.isError === true) {
         const text = created.content.map((content) => content.text).join('\n');
-        const code = refusalCode(text);
-        if (UNWRITABLE.has(code))
+        const refusal = refusalOf(text);
+        if (UNWRITABLE.has(refusal?.code ?? ''))
             return;
-        if (code !== 'edit_conflict' || !documentPresent(text))
+        if (refusal?.code !== 'edit_conflict' || !refusal.conflicts.includes('path_exists'))
             throw new Error(text);
     }
     await writeFile(join(kitHome(), CREATED), '');

package/dist/stream.js

@@ -1,16 +1,37 @@
+import { subscribe } from 'node:diagnostics_channel';
+import { finalRefusal, HouseRefusal, retryDelay } from './api.js';
+import { end, REPLACED, SIGN_IN_AGAIN } from './end.js';
 import { readEnrolment } from './home.js';
+import { relayed } from './relay.js';
+const PATH = '/kit/stream';
 const SUBPROTOCOL = 'house.kit.stream.1';
+const REFUSAL_HEADER = 'x-house-refusal';
 function streamUrl(house) {
-    const url = new URL('/kit/stream', house);
+    const url = new URL(PATH, house);
     url.protocol = url.protocol === 'https:' ? 'wss:' : 'ws:';
     return url;
 }
+function header(headers, name) {
+    for (let index = 0; index < headers.length; index += 2) {
+        if (headers[index].toString('latin1').toLowerCase() === name)
+            return headers[index + 1].toString('latin1');
+    }
+    return '';
+}
+let refused = null;
+subscribe('undici:request:headers', (message) => {
+    const { request, response } = message;
+    if (!request.path.endsWith(PATH))
+        return;
+    refused = new HouseRefusal(PATH, response.statusCode, header(response.headers, REFUSAL_HEADER) || response.statusText);
+});
 export function holdStream(handlers) {
     let socket = null;
     let failures = 0;
     const connect = async () => {
         const { house, credential } = (await readEnrolment());
-        const opening = new WebSocket(streamUrl(house), {
+        refused = null;
+        const opening = new WebSocket(relayed(streamUrl(house)), {
             protocols: [SUBPROTOCOL],
             headers: { authorization: `Bearer ${credential}` },
         });
@@ -29,10 +50,14 @@ export function holdStream(handlers) {
             if (socket === opening)
                 socket = null;
             process.stderr.write(`kit: control stream closed ${event.code} ${event.reason}\n`);
-            const delay = opened
-                ? 1000 + Math.random() * 2000
-                : Math.min(30_000, 1000 * 2 ** failures++);
-            setTimeout(() => void connect(), delay);
+            if (event.reason === 'replaced')
+                end(REPLACED);
+            if (event.reason === 'credential_rejected' || refused?.status === 401)
+                end(SIGN_IN_AGAIN);
+            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++));
         };
     };
     void connect();