@agentshouse/kit 0.2.1-c3cf4b145dcda → 0.2.1-c46722ad48058

package/dist/resident.js

@@ -2,45 +2,51 @@ 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, 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);
 }
-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');
     await rm(socketPath, { force: true });
     const server = createServer(async (request, response) => {
         try {
-            if (request.url !== '/git/push') {
+            const text = await received(request);
+            let answered;
+            if (request.url === '/git/fetch') {
+                answered = await copies.fetch();
+            }
+            else if (request.url === '/git/push') {
+                const { cwd, commit } = JSON.parse(text);
+                answered = await copies.push(cwd, commit, copies.owner);
+            }
+            else {
                 response.writeHead(404).end();
                 return;
             }
-            const { cwd, commit } = JSON.parse(await received(request));
-            const pushed = await copies.push(cwd, commit, copies.owner);
-            response.writeHead(200, { 'content-type': 'application/json' }).end(JSON.stringify(pushed));
+            response.writeHead(200, { 'content-type': 'application/json' }).end(JSON.stringify(answered));
         }
         catch (error) {
             response.writeHead(502).end(error instanceof Error ? error.message : String(error));
@@ -79,7 +85,8 @@ export async function resident() {
     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;
@@ -115,18 +122,13 @@ export async function resident() {
         opened: () => {
             conversations.opened();
             changed();
-            logged(copies.select());
+            logged(copies.connected());
         },
         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')
-                logged(copies.select());
-            if (arrived.type === 'entries') {
-                copies.entries(arrived);
-            }
             if (arrived.type === 'input') {
                 reported = false;
                 if (arrived.kind === 'sign_in')

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/sign-in.js

@@ -1,7 +1,7 @@
 import { spawn } from 'node:child_process';
 import { createInterface } from 'node:readline';
-import { killTree } from './acp.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+/;

package/dist/work.js

@@ -0,0 +1,348 @@
+import { randomUUID } from 'node:crypto';
+import { once } from 'node:events';
+import { readFileSync } from 'node:fs';
+import { mkdir, rm } from 'node:fs/promises';
+import { createServer } from 'node:net';
+import { join } from 'node:path';
+import { RUNNING_JOB } from './events.js';
+import { kitHome } from './home.js';
+const ENDED_TASK = new Set(['completed', 'failed', 'killed']);
+const SCHEDULING = new Set(['CronCreate', 'CronDelete', 'ScheduleWakeup']);
+const QUEUE_LIST = 'house-kit-queue-';
+const SYNC = 'house-kit-sync-';
+const WAKEUP = /Next wakeup scheduled for (\d\d):(\d\d):(\d\d) \(in (\d+)s\)/;
+const HALF_DAY = 12 * 60 * 60 * 1000;
+export function codexLauncher() {
+    return join(kitHome(), 'launchers', 'codex');
+}
+export class Work {
+    changed;
+    jobs = new Set();
+    constructor(changed) {
+        this.changed = changed;
+    }
+    async open(_cli) {
+        return {};
+    }
+    async settled() { }
+    read(message) {
+        this.take(message);
+        this.changed();
+    }
+    take(message) {
+        const update = message.params?.update;
+        if (message.method !== 'session/update' || update?.asyncTaskId === undefined)
+            return;
+        if (update.sessionUpdate === 'async_task_spawned')
+            this.jobs.add(update.asyncTaskId);
+        if (update.sessionUpdate === 'async_task_state_update' && !RUNNING_JOB.has(update.state))
+            this.jobs.delete(update.asyncTaskId);
+    }
+    busy() {
+        return this.jobs.size > 0;
+    }
+    close() { }
+}
+class ClaudeWork extends Work {
+    cwd;
+    level = new Set();
+    listed = new Set();
+    started = new Set();
+    running = false;
+    hooks = new Set();
+    calls = new Map();
+    crons = new Map();
+    wakeups = [];
+    goal = false;
+    constructor(cwd, changed) {
+        super(changed);
+        this.cwd = cwd;
+    }
+    take(message) {
+        super.take(message);
+        if (message.method === '_claude/sdkMessage')
+            this.sdk(message.params.message);
+        if (message.method === 'session/update')
+            this.update(message.params.update);
+    }
+    busy() {
+        return (super.busy() ||
+            this.level.size > 0 ||
+            this.started.size > 0 ||
+            this.running ||
+            this.hooks.size > 0 ||
+            this.crons.size > 0 ||
+            this.wakeups.length > 0 ||
+            this.goal ||
+            this.durable());
+    }
+    sdk(message) {
+        switch (message.subtype) {
+            case 'background_tasks_changed':
+                this.level = new Set(message.tasks.map((task) => task.task_id));
+                for (const id of this.level) {
+                    this.listed.add(id);
+                    this.started.delete(id);
+                }
+                break;
+            case 'task_started':
+                if (!this.listed.has(message.task_id))
+                    this.started.add(message.task_id);
+                break;
+            case 'task_updated':
+                if (ENDED_TASK.has(message.patch.status))
+                    this.started.delete(message.task_id);
+                break;
+            case 'task_notification':
+                this.started.delete(message.task_id);
+                break;
+            case 'session_state_changed':
+                if (message.state === 'running' && !this.running)
+                    this.wakeups = this.wakeups.filter((due) => due > Date.now());
+                this.running = message.state === 'running';
+                break;
+            case 'hook_started':
+                this.hooks.add(message.hook_id);
+                break;
+            case 'hook_response':
+                this.hooks.delete(message.hook_id);
+                break;
+        }
+    }
+    update(update) {
+        const air = update._meta?.jetbrains?.air;
+        if (update.sessionUpdate === 'session_info_update' && air !== undefined && 'goal' in air) {
+            this.goal = air.goal?.status === 'active';
+        }
+        if (update.sessionUpdate !== 'tool_call' && update.sessionUpdate !== 'tool_call_update')
+            return;
+        const tool = update._meta?.claudeCode?.toolName;
+        if (update.sessionUpdate === 'tool_call' && SCHEDULING.has(tool ?? ''))
+            this.calls.set(update.toolCallId, { tool });
+        const call = this.calls.get(update.toolCallId);
+        if (call === undefined)
+            return;
+        if (update.rawInput !== undefined)
+            call.input = update.rawInput;
+        if (update.content !== undefined)
+            call.content = update.content;
+        if (update.status === 'failed')
+            this.calls.delete(update.toolCallId);
+        if (update.status !== 'completed')
+            return;
+        this.calls.delete(update.toolCallId);
+        if (call.tool === 'CronCreate')
+            this.crons.set(update.toolCallId, JSON.stringify(call.content ?? []));
+        if (call.tool === 'ScheduleWakeup')
+            this.wakeup(call);
+        if (call.tool !== 'CronDelete')
+            return;
+        for (const [id, text] of this.crons)
+            if (text.includes(String(call.input?.id)))
+                this.crons.delete(id);
+    }
+    wakeup(call) {
+        if (call.input?.stop === true) {
+            this.wakeups = [];
+            return;
+        }
+        const time = WAKEUP.exec(JSON.stringify(call.content ?? []));
+        if (time === null) {
+            this.wakeups.push(Infinity);
+            return;
+        }
+        const fires = Date.now() + Number(time[4]) * 1000;
+        const due = new Date(fires);
+        due.setHours(Number(time[1]), Number(time[2]), Number(time[3]), 0);
+        if (due.getTime() - fires > HALF_DAY)
+            due.setDate(due.getDate() - 1);
+        if (fires - due.getTime() > HALF_DAY)
+            due.setDate(due.getDate() + 1);
+        this.wakeups.push(due.getTime());
+    }
+    durable() {
+        let text;
+        try {
+            text = readFileSync(join(this.cwd, '.claude', 'scheduled_tasks.json'), 'utf8');
+        }
+        catch (error) {
+            return error.code !== 'ENOENT';
+        }
+        try {
+            return JSON.parse(text).tasks?.length !== 0;
+        }
+        catch {
+            return true;
+        }
+    }
+}
+class CodexWork extends Work {
+    threads = new Map();
+    queues = new Map();
+    goals = new Set();
+    items = new Set();
+    hooks = new Set();
+    starting = new Set();
+    settling = [];
+    memories = null;
+    lost = false;
+    server = null;
+    path = null;
+    socket = null;
+    asked = 0;
+    heard = 0;
+    proving = -1;
+    proven = -1;
+    async open(cli) {
+        const sockets = join(kitHome(), 'bridges');
+        await mkdir(sockets, { recursive: true, mode: 0o700 });
+        this.path = join(sockets, `${randomUUID()}.sock`);
+        this.server = createServer((socket) => this.connected(socket));
+        this.server.listen(this.path);
+        await once(this.server, 'listening');
+        return { CODEX_PATH: codexLauncher(), HOUSE_KIT_CODEX: cli, HOUSE_KIT_CODEX_STREAM: this.path };
+    }
+    settled() {
+        return new Promise((resolve) => {
+            this.settling.push(resolve);
+            this.settle();
+        });
+    }
+    take(message) {
+        super.take(message);
+        this.heard++;
+    }
+    busy() {
+        if (super.busy() ||
+            this.lost ||
+            this.memories !== false ||
+            [...this.threads.values()].some(Boolean) ||
+            this.queues.size > 0 ||
+            this.goals.size > 0 ||
+            this.items.size > 0 ||
+            this.hooks.size > 0) {
+            return true;
+        }
+        if (this.proven === this.heard)
+            return false;
+        this.prove();
+        return true;
+    }
+    close() {
+        this.server?.close();
+        if (this.path !== null)
+            void rm(this.path, { force: true });
+    }
+    connected(socket) {
+        this.socket = socket;
+        let buffer = '';
+        socket.on('error', () => this.lose());
+        socket.on('close', () => this.lose());
+        socket.setEncoding('utf8').on('data', (chunk) => {
+            buffer += chunk;
+            for (let index = buffer.indexOf('\n'); index >= 0; index = buffer.indexOf('\n')) {
+                const message = this.parsed(buffer.slice(0, index));
+                buffer = buffer.slice(index + 1);
+                if (message !== null)
+                    this.stream(message, socket);
+            }
+            this.settle();
+            this.changed();
+        });
+    }
+    parsed(line) {
+        try {
+            return JSON.parse(line);
+        }
+        catch {
+            this.lost = true;
+            return null;
+        }
+    }
+    lose() {
+        this.lost = true;
+        this.changed();
+    }
+    prove() {
+        if (this.proving === this.heard)
+            return;
+        this.proving = this.heard;
+        this.socket.write(`${JSON.stringify({ jsonrpc: '2.0', id: `${SYNC}${this.heard}`, method: 'house-kit/sync' })}\n`);
+    }
+    settle() {
+        if (this.starting.size === 0)
+            for (const resolve of this.settling.splice(0))
+                resolve();
+    }
+    stream(message, socket) {
+        const params = message.params;
+        switch (message.method) {
+            case 'thread/status/changed':
+                this.threads.set(params.threadId, params.status.type === 'active' && params.status.activeFlags.length === 0);
+                break;
+            case 'thread/closed':
+                this.threads.delete(params.threadId);
+                break;
+            case 'thread/queue/changed':
+                this.queues.set(params.threadId, ++this.asked);
+                socket.write(`${JSON.stringify({ jsonrpc: '2.0', id: `${QUEUE_LIST}${this.asked}`, method: 'thread/queue/list', params: { threadId: params.threadId } })}\n`);
+                break;
+            case 'thread/goal/updated':
+                if (params.goal.status === 'active')
+                    this.goals.add(params.threadId);
+                else
+                    this.goals.delete(params.threadId);
+                break;
+            case 'thread/goal/cleared':
+                this.goals.delete(params.threadId);
+                break;
+            case 'item/started':
+                this.items.add(`${params.threadId} ${params.item.id}`);
+                break;
+            case 'item/completed':
+                this.items.delete(`${params.threadId} ${params.item.id}`);
+                break;
+            case 'hook/started':
+                this.hooks.add(params.run.id);
+                break;
+            case 'hook/completed':
+                this.hooks.delete(params.run.id);
+                break;
+            case 'mcpServer/startupStatus/updated':
+                if (params.status === 'starting')
+                    this.starting.add(`${params.threadId} ${params.name}`);
+                else
+                    this.starting.delete(`${params.threadId} ${params.name}`);
+                break;
+            case undefined:
+                this.answered(message);
+        }
+    }
+    answered(message) {
+        if (typeof message.id === 'string' && message.id.startsWith(SYNC)) {
+            this.proven = Number(message.id.slice(SYNC.length));
+        }
+        else if (typeof message.id === 'string' && message.id.startsWith(QUEUE_LIST)) {
+            const asked = Number(message.id.slice(QUEUE_LIST.length));
+            for (const [thread, latest] of this.queues) {
+                if (latest === asked && message.result?.data?.length === 0)
+                    this.queues.delete(thread);
+            }
+        }
+        else if (message.result?.config?.features !== undefined) {
+            this.memories = message.result.config.features.memories !== false;
+        }
+    }
+}
+class GrokWork extends Work {
+    busy() {
+        return true;
+    }
+}
+export function workFor(kind, cwd, changed) {
+    if (kind === 'claude-agent-acp')
+        return new ClaudeWork(cwd, changed);
+    if (kind === 'codex-acp')
+        return new CodexWork(changed);
+    return new GrokWork(changed);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentshouse/kit",
-  "version": "0.2.1-c3cf4b145dcda",
+  "version": "0.2.1-c46722ad48058",
   "description": "House Kit connects an Environment to agents.house.",
   "license": "MIT",
   "repository": {
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@agentclientprotocol/sdk": "1.7.0",
-    "@agentshouse/mdmodel": "0.1.0-alpha.19",
+    "@agentshouse/mdmodel": "0.1.0-c68e2039f1ca8",
     "yaml": "2.9.1"
   },
   "peerDependencies": {