@agentshouse/kit 0.2.1-c0b0ffa6c025b → 0.2.1-c0eea939ba749

package/dist/copies.js

@@ -15,6 +15,9 @@ const IDENTITY = { GIT_COMMITTER_NAME: 'House Kit', GIT_COMMITTER_EMAIL: 'house-
 function causeOf(error) {
     return error instanceof Error ? error.message : String(error);
 }
+function houseCause(error) {
+    return error instanceof HouseRefusal ? (refusalOf(error.text)?.text ?? causeOf(error)) : causeOf(error);
+}
 function logged(error) {
     process.stderr.write(`kit: ${causeOf(error)}\n`);
 }
@@ -33,6 +36,9 @@ function textOnly(paths) {
     const [named, them] = paths.length === 1 ? [`${paths[0]} is`, 'it'] : [`${paths.join(', ')} are`, 'them'];
     return `${named} not text, and house push sends text only; remove ${them} from the commit and place ${them} with house upload`;
 }
+function outside(path) {
+    return { refused: true, text: `${path} is not a House Local copy; run house push inside one` };
+}
 function short(commit) {
     return commit.slice(0, 12);
 }
@@ -52,6 +58,9 @@ function expiredAuthority(error) {
         return undefined;
     }
 }
+function grouped(items, size) {
+    return items.flatMap((_, index) => (index % size === 0 ? [items.slice(index, index + size)] : []));
+}
 function covers(path, prefix) {
     return prefix === '' || path === prefix || path.startsWith(`${prefix}/`);
 }
@@ -60,6 +69,9 @@ function sidecar(path) {
     segments.splice(-1, 0, PROVENANCE);
     return segments.join('/');
 }
+function recordOf(key) {
+    return join(kitHome(), 'local-copies', `${key}.json`);
+}
 function rootOf(handle) {
     return `/rooms/${handle}`;
 }
@@ -206,48 +218,62 @@ export class LocalCopies {
     async mapping() {
         await this.answering;
         return [...this.copies.values()]
-            .filter((copy) => copy.active)
+            .filter((copy) => copy.erasing === undefined)
             .map((copy) => `${rootOf(copy.room_handle)}: ${copy.repository}`)
             .sort();
     }
-    async connected() {
-        const copied = await this.answered(() => this.fetched(false));
-        if (copied.refused)
-            logged(copied.text);
+    connected() {
+        return this.selected();
+    }
+    async changed(rooms) {
+        if (rooms.length > 0)
+            await this.selected(rooms);
     }
     fetch() {
         return this.answered(() => this.fetched(true));
     }
+    async selected(rooms) {
+        const copied = await this.answered(() => this.fetched(false, rooms));
+        if (copied.refused)
+            logged(copied.text);
+    }
     answered(work) {
         const answered = this.answering.then(work);
         this.answering = answered.catch(() => undefined);
         return answered;
     }
-    async fetched(refreshing) {
-        const { local_copy: answer } = await this.house.post('/kit/local-copy/selection', {});
+    async fetched(refreshing, rooms) {
+        const { local_copy: answer } = await this.house.post('/kit/local-copy/selection', rooms === undefined ? {} : { rooms });
         const synced = new Map(answer.rooms.map((room) => [`rooms/${room.room_ref}`, room.room_handle]));
-        return this.holding([...new Set([...this.copies.keys(), ...synced.keys()])].sort(), async () => {
+        const named = rooms === undefined ? null : new Set(rooms.map((room) => `rooms/${room}`));
+        const held = () => [...this.copies.values()].filter((copy) => named === null || named.has(copy.key));
+        return this.holding([...new Set([...held().map((copy) => copy.key), ...synced.keys()])].sort(), async () => {
             const said = [];
             let refused = false;
-            for (const copy of this.copies.values()) {
-                if (synced.has(copy.key) || !copy.active)
+            for (const copy of held()) {
+                const returned = synced.has(copy.key);
+                if (returned && copy.erasing === undefined)
                     continue;
-                await this.save({ ...copy, active: false });
-                said.push(`${rootOf(copy.room_handle)}: no longer synced to this Environment; its files stay`);
+                try {
+                    await this.erase(copy);
+                    said.push(`${rootOf(copy.room_handle)}: ${returned ? '' : 'no longer synced to this Environment; '}erased from the Local copy`);
+                }
+                catch (error) {
+                    refused = true;
+                    said.push(`${rootOf(copy.room_handle)}: ${causeOf(error)}`);
+                }
             }
             const current = [];
             for (const [key, handle] of synced) {
                 try {
                     const held = this.copies.get(key);
+                    if (held?.erasing)
+                        continue;
                     if (held === undefined || !(await exists(held.repository))) {
                         said.push(await this.materialize(key, handle));
                         continue;
                     }
-                    const copy = held.room_handle === handle ? held : await this.save({ ...held, room_handle: handle });
-                    if (copy.active)
-                        current.push(copy);
-                    else
-                        said.push(...moved(copy, await this.save(await this.received({ ...copy, active: true }))));
+                    current.push(held.room_handle === handle ? held : await this.save({ ...held, room_handle: handle }));
                 }
                 catch (error) {
                     refused = true;
@@ -255,13 +281,12 @@ export class LocalCopies {
                 }
             }
             if (refreshing && current.length > 0) {
-                try {
-                    const refreshed = await this.refreshed(current);
-                    current.forEach((copy, index) => said.push(...moved(copy, refreshed[index])));
-                }
-                catch (error) {
+                const failed = await this.refreshed(current).then(() => null, houseCause);
+                for (const copy of current)
+                    said.push(...moved(copy, this.copies.get(copy.key)));
+                if (failed !== null) {
                     refused = true;
-                    said.push(error instanceof HouseRefusal ? (refusalOf(error.text)?.text ?? causeOf(error)) : causeOf(error));
+                    said.push(failed);
                 }
             }
             return { refused, text: said.length === 0 ? 'Nothing new from House.' : said.join('\n') };
@@ -273,6 +298,8 @@ export class LocalCopies {
             return;
         await this.exclusive(key, async () => {
             const copy = this.copies.get(key);
+            if (copy === undefined || copy.erasing)
+                return;
             let moves = copy.moves;
             for (const { from, to } of report.moves) {
                 const held = moves.find((move) => move.worktree === report.worktree && move.to === from);
@@ -295,11 +322,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 push inside one` };
+            return outside(cwd);
         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 push inside one` };
+            return outside(worktree);
         return this.exclusive(key, () => this.pushed(key, worktree, selector, caller));
     }
     async keyAt(repository) {
@@ -320,7 +347,7 @@ export class LocalCopies {
         return key === undefined ? work() : this.exclusive(key, () => this.holding(rest, work));
     }
     async save(copy) {
-        const path = join(kitHome(), 'local-copies', `${copy.key}.json`);
+        const path = recordOf(copy.key);
         await mkdir(dirname(path), { recursive: true, mode: 0o700 });
         const temporary = `${path}.${process.pid}`;
         await writeFile(temporary, JSON.stringify(copy), { mode: 0o600 });
@@ -328,6 +355,12 @@ export class LocalCopies {
         this.copies.set(copy.key, copy);
         return copy;
     }
+    async erase(copy) {
+        await this.save({ ...copy, erasing: true });
+        await rm(copy.repository, { recursive: true, force: true });
+        await rm(recordOf(copy.key), { force: true });
+        this.copies.delete(copy.key);
+    }
     async read(handle) {
         const prefixes = [rootOf(handle)];
         const discovery = await this.house.post('/kit/door/discover', { prefixes });
@@ -394,7 +427,6 @@ export class LocalCopies {
             room_ref: read.anchor,
             room_handle: handle,
             repository,
-            active: true,
             house,
             position: read.position,
             log_epoch: read.log_epoch,
@@ -429,19 +461,24 @@ export class LocalCopies {
         return next;
     }
     async refreshed(copies) {
-        const discovery = await this.house.post('/kit/door/discover', {
-            prefixes: copies.map((copy) => rootOf(copy.room_handle)),
-        });
-        const regranted = new Map();
+        const discover = (group) => this.house.post('/kit/door/discover', { prefixes: group.map((copy) => rootOf(copy.room_handle)) });
+        const [first, ...rest] = copies;
+        const { bounds, authorities } = await discover([first]);
+        for (const group of grouped(rest, bounds.max_prefixes))
+            authorities.push(...(await discover(group)).authorities);
+        const unchanged = [];
         for (const copy of copies) {
-            const authority = discovery.authorities.find((entry) => entry.room_ref === copy.room_ref);
+            const authority = authorities.find((entry) => entry.room_ref === copy.room_ref);
             if (authority !== undefined &&
                 JSON.stringify([authority.operations.write, authority.protected_paths]) !== JSON.stringify([copy.write, copy.protected])) {
-                regranted.set(copy.key, await this.save(await this.received(copy)));
+                await this.save(await this.received(copy));
+            }
+            else {
+                unchanged.push(copy);
             }
         }
-        const caught = await this.caughtUp(copies.filter((copy) => !regranted.has(copy.key)), false);
-        return copies.map((copy) => regranted.get(copy.key) ?? caught.find((held) => held.key === copy.key));
+        for (const group of grouped(unchanged, bounds.max_prefixes))
+            await this.caughtUp(group, false);
     }
     async caughtUp(copies, whole) {
         const caught = new Map(copies.map((copy) => [copy.key, copy]));
@@ -523,6 +560,8 @@ export class LocalCopies {
     }
     async pushed(key, worktree, selector, caller) {
         let copy = this.copies.get(key);
+        if (copy === undefined || copy.erasing)
+            return outside(worktree);
         if (copy.push?.state === 'submitted')
             return this.settle(copy, caller);
         const selected = await run(worktree, ['rev-parse', '--verify', '--quiet', '--end-of-options', `${selector}^{commit}`]);
@@ -536,9 +575,6 @@ export class LocalCopies {
             }
             copy = await this.save(without(copy));
         }
-        if (!copy.active) {
-            return { refused: true, text: `${rootOf(copy.room_handle)} is no longer synced to this Environment, so House takes no push from it` };
-        }
         const listed = (await git(copy.repository, ['rev-list', '--topo-order', commit])).split('\n');
         const base = listed.find((ancestor) => ancestor in copy.manifests);
         if (base === undefined) {
@@ -549,7 +585,7 @@ export class LocalCopies {
             changes = await this.derived(copy, base, commit);
         }
         catch (error) {
-            return { refused: true, text: causeOf(error) };
+            return { refused: true, text: houseCause(error) };
         }
         if (changes.length === 0)
             return { refused: false, text: `Nothing to submit: ${short(commit)} matches House.` };
@@ -576,12 +612,17 @@ export class LocalCopies {
         const after = await tree(copy.repository, commit);
         const moved = movedPaths(copy.moves, before, after);
         const arrived = new Set(moved.values());
-        const binary = [];
-        for (const [path, entry] of after)
-            if (before.get(path) !== entry && !(await isText(copy.repository, entry)))
-                binary.push(path);
-        if (binary.length > 0)
-            throw new Error(textOnly(binary));
+        const arriving = [...after].filter(([path, entry]) => before.get(path) !== entry);
+        if (arriving.length > 0) {
+            const { bounds } = await this.house.post('/kit/door/discover', { prefixes: [root] });
+            const binary = [];
+            for (const [path, entry] of arriving) {
+                if (!(await isText(copy.repository, entry, bounds.max_authored_file_bytes)))
+                    binary.push(path);
+            }
+            if (binary.length > 0)
+                throw new Error(textOnly(binary));
+        }
         const text = (entry) => blobText(copy.repository, entry);
         const changes = [];
         for (const path of [...new Set([...before.keys(), ...after.keys()])].sort()) {

package/dist/end.js

@@ -13,8 +13,9 @@ export function end(reason) {
 export function restart(reason) {
     exit(reason, 1);
 }
-export function updateRequired(house) {
-    end(`This Kit is too old for House. Update it: ${installCommand(house)}`);
+export function updateRequired() {
+    const command = installCommand();
+    end(command === null ? 'This Kit is too old for House; install it again.' : `This Kit is too old for House. Update it: ${command}`);
 }
 export async function signInAgain(rejected) {
     await forgetRejected(rejected);

package/dist/events.js

@@ -512,6 +512,10 @@ class GrokReader extends Reader {
         return [];
     }
 }
+export function answeredFailure(answer) {
+    const failure = answer._meta?.jetbrains?.air?.sessionFailure;
+    return typeof failure?.title === 'string' ? { title: failure.title, limit: failure.category === 'limit' } : null;
+}
 export function readerFor(kind) {
     if (kind === 'claude-agent-acp')
         return new ClaudeReader();

package/dist/files.js

@@ -11,7 +11,7 @@ export function verified(bytes, sha256, name) {
 export async function placeFiles(house, directory, files, signal) {
     const paths = [];
     for (const file of files) {
-        const original = await house.post('/kit/conversation/originals/get', { version: file.version, download: true }, signal);
+        const original = await retrying(() => house.post('/kit/conversation/originals/get', { version: file.version, download: true }, signal), signal);
         const answer = await fetch(relayed(original.download.url), { signal });
         if (!answer.ok)
             throw new Error(`${file.name} did not download: ${answer.status}`);

package/dist/git.js

@@ -49,16 +49,15 @@ export async function tree(repository, commit) {
     }
     return entries;
 }
-const TEXT_MAX_BYTES = 16 * 1024 * 1024;
 async function blob(repository, object) {
     return (await run(repository, ['cat-file', 'blob', object])).stdout;
 }
 export async function blobText(repository, object) {
     return (await blob(repository, object)).toString('utf8');
 }
-export async function isText(repository, object) {
+export async function isText(repository, object, maxBytes) {
     const bytes = await blob(repository, object);
-    return bytes.length <= TEXT_MAX_BYTES && isUtf8(bytes) && !bytes.includes(0);
+    return bytes.length <= maxBytes && isUtf8(bytes) && !bytes.includes(0);
 }
 export function blobId(content) {
     const bytes = Buffer.from(content, 'utf8');

package/dist/home.js

@@ -1,8 +1,8 @@
-import { randomUUID } from 'node:crypto';
-import { accessSync, chmodSync, constants, existsSync, linkSync, lstatSync, mkdirSync, 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, tmpdir } from 'node:os';
-import { join } from 'node:path';
+import { join, resolve } from 'node:path';
 import { selectRelay } from './relay.js';
 const ENROLMENT = 'credential.json';
 const DISCONNECTED = 'disconnected.json';
@@ -19,24 +19,26 @@ function writable(directory) {
         return false;
     }
 }
-function ownTemporaryHome() {
-    const home = join(tmpdir(), `house-kit-${process.getuid()}`);
+function privateDirectory(path) {
     try {
-        mkdirSync(home, { mode: 0o700 });
+        mkdirSync(path, { mode: 0o700 });
     }
     catch (error) {
         if (error.code !== 'EEXIST')
             throw error;
     }
-    const found = lstatSync(home);
+    const found = lstatSync(path);
     if (found.isSymbolicLink())
-        throw new Error(`${home} is a symbolic link`);
+        throw new Error(`${path} is a symbolic link`);
     if (!found.isDirectory())
-        throw new Error(`${home} is not a directory`);
-    if (found.uid !== process.getuid())
-        throw new Error(`${home} is not owned by this User`);
-    chmodSync(home, 0o700);
-    return home;
+        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');
@@ -45,6 +47,18 @@ function defaultHome() {
 export function kitHome() {
     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';
 }