@agentshouse/kit 0.2.1-c8179f06883b6 → 0.2.1-c84a4fccf2835

package/dist/conversations.js

@@ -1,32 +1,82 @@
-import { client, } from '@agentclientprotocol/sdk';
+import { client, RequestError, } from '@agentclientprotocol/sdk';
 import { createHash, randomUUID } from 'node:crypto';
 import { mkdir } from 'node:fs/promises';
 import { join } from 'node:path';
 import { unlessAborted } from './abort.js';
 import { startAdapter } from './acp.js';
+import { finalRefusal } from './api.js';
 import { openBridge } from './bridge.js';
 import { CLIS } from './clis.js';
-import { readerFor } from './events.js';
+import { answeredFailure, readerFor } from './events.js';
 import { placeFiles, uploadBytes } from './files.js';
 import { agentBase } from './home.js';
 import { instructions } from './instructions.js';
 import { Parts } from './parts.js';
+import { refusalOf } from './refusals.js';
 import { killMarked, Scope } from './scope.js';
 import { holdSecretInput } from './secret-input.js';
 import { createHowWeWork } from './skills.js';
 import { transcribe } from './transcription.js';
 import { workFor } from './work.js';
+const SIGNED_OUT = RequestError.authRequired().code;
 const KILLED = 'the conversation was killed';
+const REFUSED = 'the CLI refused the prompt';
+const NO_CONNECTION = "the Agent's computer could not open this conversation; try again";
+const GONE = 'House no longer holds this conversation; start a new one';
+const RETIRED = "this conversation's Agent is retired, so it cannot start";
+const ENDED = {
+    conversation_not_found: GONE,
+    conversation_historical: RETIRED,
+};
+const NO_START = "the Agent's CLI did not start";
+const NO_SESSION = "the Agent's CLI did not open a session";
+const NO_RESUME = "the Agent's CLI could not resume this conversation";
+const NO_SETTINGS = "the Agent's CLI refused the Agent's model, mode or effort";
+class NotStarted extends Error {
+}
+async function step(reason, work) {
+    try {
+        return await work;
+    }
+    catch (error) {
+        throw new NotStarted(typeof reason === 'string' ? reason : reason(error), { cause: error });
+    }
+}
+function unbridged(error) {
+    return (finalRefusal(error) ? ENDED[refusalOf(error.text)?.code ?? ''] : undefined) ?? NO_CONNECTION;
+}
+const EXIT_PLAN_MODE = {
+    parse(value) {
+        if (typeof value !== 'object' || value === null || Array.isArray(value)) {
+            throw new Error('_x.ai/exit_plan_mode needs an object');
+        }
+        return value;
+    },
+};
 export const CONVERSATION_INPUTS = new Set(['open', 'message', 'interrupt', 'kill', 'option', 'answer']);
 function causeOf(error) {
     return error instanceof Error ? error.message : String(error);
 }
+function answeredWith(error) {
+    const signedOut = typeof error === 'object' && error !== null && error.code === SIGNED_OUT;
+    return { failure: signedOut ? 'signed_out' : 'error', cause: causeOf(error) };
+}
+function exitedWith(running, cause) {
+    return running.killed ? { failure: 'killed', cause: KILLED } : { failure: 'exited', cause };
+}
 function answerMessage(request, response) {
     return `The User answered a question you asked earlier.\nQuestion: ${JSON.stringify(request)}\nAnswer: ${JSON.stringify(response)}`;
 }
 function logged(error) {
     process.stderr.write(`kit: ${causeOf(error)}\n`);
 }
+function refusal(conversation, error) {
+    if (conversation.kills > 0)
+        return KILLED;
+    const cause = error instanceof NotStarted ? `${error.message}: ${causeOf(error.cause)}` : causeOf(error);
+    logged(new Error(`conversation ${conversation.id} did not start: ${cause}`));
+    return causeOf(error);
+}
 function marker(bridge) {
     return `HOUSE_BRIDGE=${bridge.env.HOUSE_BRIDGE}`;
 }
@@ -57,6 +107,7 @@ class Conversation {
     subagents = new Map();
     held = [];
     opening = null;
+    prompted = null;
     kills = 0;
     killed = new AbortController();
     interrupts = 0;
@@ -79,9 +130,7 @@ function asksSecret(request) {
 export class Conversations {
     kit;
     conversations = new Map();
-    acks = new Map();
     questions = new Map();
-    carrying = 0;
     reporting = 0;
     watched = false;
     constructor(kit) {
@@ -90,37 +139,26 @@ export class Conversations {
         setInterval(() => this.look(), 2_000);
     }
     input(input) {
-        this.carrying++;
-        const carried = this.acks.get(input.input_id) ??
-            (() => {
-                const conversation = this.conversation(input.conversation_id);
-                if (input.kind === 'kill') {
-                    conversation.kills++;
-                    conversation.killed.abort(new Error(KILLED));
-                    for (const waiting of conversation.waiting.splice(0))
-                        waiting.settle({ refused: KILLED });
-                    this.halt(conversation);
-                }
-                if (input.kind === 'interrupt') {
-                    conversation.interrupts++;
-                    conversation.interrupted.abort();
-                }
-                const handled = conversation.queue.then(() => this.carry(conversation, input));
-                conversation.queue = handled.catch(() => undefined);
-                const work = handled.then(({ ack }) => ack);
-                this.acks.set(input.input_id, work);
-                return work;
-            })();
-        carried
-            .then((body) => this.kit.house.deliver(`/kit/inputs/${input.input_id}/ack`, body))
-            .catch(logged)
-            .finally(() => {
-            this.carrying--;
-            this.kit.changed();
+        void this.kit.inputs.carry(input.input_id, () => {
+            const conversation = this.conversation(input.conversation_id);
+            if (input.kind === 'kill') {
+                conversation.kills++;
+                conversation.killed.abort(new Error(KILLED));
+                for (const waiting of conversation.waiting.splice(0))
+                    waiting.settle({ refused: KILLED });
+                this.halt(conversation);
+            }
+            if (input.kind === 'interrupt') {
+                conversation.interrupts++;
+                conversation.interrupted.abort();
+            }
+            const handled = conversation.queue.then(() => this.carry(conversation, input));
+            conversation.queue = handled.catch(() => undefined);
+            return handled.then(async ({ ack }) => ({ ack: await ack }));
         });
     }
     idle() {
-        if (this.carrying > 0 || this.reporting > 0)
+        if (this.reporting > 0)
             return false;
         for (const conversation of this.conversations.values()) {
             const turn = conversation.turn;
@@ -200,10 +238,10 @@ export class Conversations {
         if (conversation.running !== null)
             return {};
         try {
-            return { provider_session_id: await this.start(conversation, await this.route(conversation, input.agent_id), null) };
+            return { provider_session_id: await this.start(conversation, await this.route(conversation, input.agent_id), null, true) };
         }
         catch (error) {
-            return { refused: causeOf(error) };
+            return { refused: refusal(conversation, error) };
         }
     }
     async message(conversation, input) {
@@ -220,7 +258,7 @@ export class Conversations {
                 throw new Error(KILLED);
         }
         catch (error) {
-            return { ack: Promise.resolve({ refused: conversation.kills > 0 ? KILLED : causeOf(error) }) };
+            return { ack: Promise.resolve({ refused: refusal(conversation, error) }) };
         }
         return {
             ack: new Promise((settle) => {
@@ -243,13 +281,17 @@ export class Conversations {
     async send(conversation, waiting) {
         const { input } = waiting;
         let ack = {};
+        let started = false;
         const prompt = [];
         try {
             if (conversation.running === null) {
-                const resumed = input.provider_session_id ?? conversation.session;
-                const opened = await this.start(conversation, waiting.route, resumed);
-                if (resumed === null)
-                    ack = { provider_session_id: opened };
+                const stored = conversation.session ?? input.provider_session_id;
+                const empty = input.first === true && conversation.prompted !== stored;
+                started = (await this.start(conversation, waiting.route, stored, empty)) !== stored;
+            }
+            const session = conversation.running.sessionId;
+            if (started || (input.first === true && session !== input.provider_session_id)) {
+                ack = { provider_session_id: session };
             }
             if (input.first === true) {
                 prompt.push({
@@ -261,11 +303,11 @@ export class Conversations {
                 throw new Error(KILLED);
         }
         catch (error) {
-            if ('provider_session_id' in ack) {
+            if (started) {
                 conversation.session = null;
                 await this.kill(conversation);
             }
-            waiting.settle({ refused: conversation.kills > 0 ? KILLED : causeOf(error) });
+            waiting.settle({ refused: refusal(conversation, error) });
             return;
         }
         this.prompt(conversation, [...prompt, ...waiting.content]);
@@ -343,14 +385,15 @@ export class Conversations {
         }
         return route;
     }
-    async start(conversation, route, sessionId) {
+    async start(conversation, route, sessionId, empty) {
         const reader = readerFor(route.kind);
         reader.session = sessionId;
         const app = client({ name: '@agentshouse/kit' })
             .onRequest('session/request_permission', ({ params, signal }) => this.ask(conversation, 'session/request_permission', params, false, signal))
-            .onRequest('elicitation/create', ({ params, signal }) => this.ask(conversation, 'elicitation/create', params, asksSecret(params), signal));
+            .onRequest('elicitation/create', ({ params, signal }) => this.ask(conversation, 'elicitation/create', params, asksSecret(params), signal))
+            .onRequest('_x.ai/exit_plan_mode', EXIT_PLAN_MODE, ({ params, signal }) => this.ask(conversation, '_x.ai/exit_plan_mode', params, false, signal));
         const cli = await unlessAborted(this.kit.agents.cli(route.kind), conversation.killed.signal);
-        const bridge = await openBridge(this.kit.house, this.kit.copies, conversation.id, conversation.killed.signal);
+        const bridge = await step(unbridged, openBridge(this.kit.house, this.kit.copies, conversation.id, conversation.killed.signal));
         if (conversation.kills > 0) {
             bridge.close();
             throw new Error(KILLED);
@@ -361,24 +404,24 @@ export class Conversations {
         try {
             await unlessAborted(createHowWeWork(bridge), conversation.killed.signal);
             await CLIS[route.kind].allowHouse(bridge.env.PATH);
-            const adapter = await startAdapter(route.kind, cli, route.working_directory, app, (message) => {
+            const streamed = await step(NO_CONNECTION, work.open(cli));
+            const adapter = await step(NO_START, startAdapter(route.kind, cli, route.working_directory, app, (message) => {
                 work.read(message);
                 this.read(conversation, reader, message);
-            }, { ...bridge.env, ...(await work.open(cli)) }, undefined, scope);
+            }, { ...bridge.env, ...streamed }, undefined, scope));
             void adapter.exited.then(() => bridge.close());
             const agent = adapter.connection.agent;
             const cwd = route.working_directory;
             const _meta = CLIS[route.kind].sessionMeta(bridge.env.HOUSE_BRIDGE, conversation.id);
-            const opened = sessionId === null
-                ? await agent.request('session/new', { cwd, mcpServers: [], _meta })
-                : { ...(await agent.request('session/resume', { sessionId, cwd, mcpServers: [], _meta })), sessionId };
+            const resumed = sessionId === null ? null : await this.resume(conversation, route.kind, adapter, { sessionId, cwd, mcpServers: [], _meta }, empty);
+            const opened = resumed ?? (await step(NO_SESSION, agent.request('session/new', { cwd, mcpServers: [], _meta })));
             reader.session = opened.sessionId;
-            if (sessionId === null && CLIS[route.kind].renames) {
+            if (opened.sessionId !== sessionId && CLIS[route.kind].renames) {
                 const prompt = [{ type: 'text', text: `/rename ${conversation.id}` }];
-                await agent.request('session/prompt', { sessionId: opened.sessionId, prompt });
+                await step(NO_SESSION, agent.request('session/prompt', { sessionId: opened.sessionId, prompt }));
             }
             const running = { adapter, bridge, sessionId: opened.sessionId, killed: false, reader, work, scope };
-            const options = await this.launchSettings(running, route, opened.configOptions ?? []);
+            const options = await step(NO_SETTINGS, this.launchSettings(running, route, opened.configOptions ?? []));
             void work.settled().then(() => scope.record());
             conversation.running = running;
             conversation.session = running.sessionId;
@@ -400,6 +443,18 @@ export class Conversations {
             conversation.opening = null;
         }
     }
+    async resume(conversation, kind, adapter, request, empty) {
+        try {
+            return { ...(await adapter.connection.agent.request('session/resume', request)), sessionId: request.sessionId };
+        }
+        catch (error) {
+            if (!empty || conversation.kills > 0 || !CLIS[kind].unknownSession(error)) {
+                throw new NotStarted(NO_RESUME, { cause: error });
+            }
+            logged(new Error(`conversation ${conversation.id} opens a new session: ${NO_RESUME}: ${causeOf(error)}`));
+            return null;
+        }
+    }
     async launchSettings(running, route, offered) {
         let options = offered;
         const settings = [
@@ -427,7 +482,7 @@ export class Conversations {
             return;
         this.detach(conversation, running);
         if (conversation.turn !== null) {
-            this.end(conversation, conversation.turn, { failed: running.killed ? KILLED : cause });
+            this.end(conversation, conversation.turn, exitedWith(running, cause));
         }
         this.next(conversation);
         this.kit.changed();
@@ -491,13 +546,17 @@ export class Conversations {
         this.kit.changed();
         return turn;
     }
-    end(conversation, turn, failed) {
+    end(conversation, turn, failed, notice = null) {
         if (turn.ended)
             return;
+        if (failed !== null)
+            logged(new Error(`conversation ${conversation.id} turn ${turn.id} failed: ${failed.cause}`));
         if (conversation.turn === turn) {
             for (const event of conversation.running?.reader.closeTurn() ?? [])
                 this.apply(conversation, turn, event);
         }
+        if (notice !== null)
+            turn.parts.start({ type: 'marker', marker: 'retry', text: notice });
         turn.ended = true;
         conversation.open--;
         if (conversation.turn === turn)
@@ -505,7 +564,7 @@ export class Conversations {
         const body = Promise.allSettled(turn.uploads).then(() => ({
             parts: turn.parts.saved(),
             context: turn.parts.context,
-            ...failed,
+            ...(failed === null ? {} : { failed: failed.failure }),
         }));
         void this.deliver(conversation, turn, 'ended', body).catch(logged);
         this.next(conversation);
@@ -515,16 +574,25 @@ export class Conversations {
         const running = conversation.running;
         const turn = this.begin(conversation);
         turn.prompted = true;
-        running.adapter.connection.agent.request('session/prompt', { sessionId: running.sessionId, prompt }).then(() => this.end(conversation, turn, null), async (error) => {
+        conversation.prompted = running.sessionId;
+        running.adapter.connection.agent.request('session/prompt', { sessionId: running.sessionId, prompt }).then((answer) => {
+            const notice = answeredFailure(answer);
+            if (notice !== null) {
+                this.end(conversation, turn, { failure: notice.limit ? 'limit' : 'error', cause: notice.title }, notice.title);
+            }
+            else {
+                this.end(conversation, turn, answer.stopReason === 'refusal' ? { failure: 'refused', cause: REFUSED } : null);
+            }
+        }, async (error) => {
             if (running.adapter.connection.signal.aborted) {
-                this.end(conversation, turn, { failed: running.killed ? KILLED : await running.adapter.exited });
+                this.end(conversation, turn, exitedWith(running, await running.adapter.exited));
             }
             else {
                 if (conversation.open === 1 && conversation.running === running) {
                     running.scope.kill();
                     this.detach(conversation, running);
                 }
-                this.end(conversation, turn, { failed: causeOf(error) });
+                this.end(conversation, turn, answeredWith(error));
             }
         });
     }

package/dist/copies.js

@@ -3,7 +3,7 @@ import { randomUUID } from 'node:crypto';
 import { mkdir, readFile, readdir, realpath, rename, rm, rmdir, stat, writeFile } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
 import { finalRefusal, HouseRefusal, retrying } from './api.js';
-import { blobId, blobText, git, HOUSE_REF, importCommits, localCopies, revision, run, succeeded, tree, } from './git.js';
+import { blobId, blobText, git, isText, HOUSE_REF, importCommits, localCopies, revision, run, succeeded, tree, } from './git.js';
 import { kitHome } from './home.js';
 import { operationId } from './operation.js';
 import { refusalOf } from './refusals.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`);
 }
@@ -29,6 +32,13 @@ const REBASED = new Set([
 function rebaseFixes(refusal) {
     return refusal.code === 'edit_conflict' && refusal.conflicts.some((code) => REBASED.has(code));
 }
+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);
 }
@@ -56,6 +66,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}`;
 }
@@ -202,7 +215,7 @@ 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();
     }
@@ -225,25 +238,30 @@ export class LocalCopies {
         return this.holding([...new Set([...this.copies.keys(), ...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 [...this.copies.values()]) {
+                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;
@@ -257,7 +275,7 @@ export class LocalCopies {
                 }
                 catch (error) {
                     refused = true;
-                    said.push(error instanceof HouseRefusal ? (refusalOf(error.text)?.text ?? causeOf(error)) : causeOf(error));
+                    said.push(houseCause(error));
                 }
             }
             return { refused, text: said.length === 0 ? 'Nothing new from House.' : said.join('\n') };
@@ -269,6 +287,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);
@@ -291,11 +311,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) {
@@ -316,7 +336,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 });
@@ -324,6 +344,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 });
@@ -390,7 +416,6 @@ export class LocalCopies {
             room_ref: read.anchor,
             room_handle: handle,
             repository,
-            active: true,
             house,
             position: read.position,
             log_epoch: read.log_epoch,
@@ -519,6 +544,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}`]);
@@ -532,9 +559,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) {
@@ -545,7 +569,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.` };
@@ -572,7 +596,18 @@ export class LocalCopies {
         const after = await tree(copy.repository, commit);
         const moved = movedPaths(copy.moves, before, after);
         const arrived = new Set(moved.values());
-        const text = (entry, path) => blobText(copy.repository, entry, path);
+        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()) {
             if (arrived.has(path))
@@ -585,7 +620,7 @@ export class LocalCopies {
                 changes.push({ op: 'rename', path: `${root}/${path}`, to: `${root}/${to}`, base: known });
                 const moving = after.get(to);
                 if (moving !== prior) {
-                    changes.push({ op: 'replace', path: `${root}/${to}`, base: known, content: await text(moving, to) });
+                    changes.push({ op: 'replace', path: `${root}/${to}`, base: known, content: await text(moving) });
                 }
                 continue;
             }
@@ -594,9 +629,9 @@ export class LocalCopies {
             if (next === undefined)
                 changes.push({ op: 'remove', path: `${root}/${path}`, base: known });
             else if (prior === undefined)
-                changes.push({ op: 'create', path: `${root}/${path}`, content: await text(next, path) });
+                changes.push({ op: 'create', path: `${root}/${path}`, content: await text(next) });
             else
-                changes.push(...changed(`${root}/${path}`, path, known, await text(prior, path), await text(next, path)));
+                changes.push(...changed(`${root}/${path}`, path, known, await text(prior), await text(next)));
         }
         return changes;
     }
@@ -663,7 +698,7 @@ export class LocalCopies {
             written.push({
                 path: `${root}/${path}`,
                 revision: entry === undefined ? null : (revisionAt(current, current.house, path) ?? null),
-                content: entry === undefined ? null : await blobText(copy.repository, entry, path),
+                content: entry === undefined ? null : await blobText(copy.repository, entry),
             });
         }
         return this.finished(await this.save({ ...current, push: { ...push, state: 'accepted', written } }));
@@ -707,7 +742,7 @@ export class LocalCopies {
                     {
                         path: `${rootOf(copy.room_handle)}/${path}`,
                         revision: entry === undefined ? null : (revisionAt(copy, copy.house, path) ?? null),
-                        content: entry === undefined ? null : await blobText(copy.repository, entry, path),
+                        content: entry === undefined ? null : await blobText(copy.repository, entry),
                     },
                 ];
             }
@@ -752,7 +787,7 @@ export class LocalCopies {
     async landed(repository, changes, house, selected) {
         const text = async (path) => {
             const entry = house.get(relative(path));
-            return entry === undefined ? undefined : blobText(repository, entry, path);
+            return entry === undefined ? undefined : blobText(repository, entry);
         };
         for (const change of changes) {
             const current = await text(change.path);

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

@@ -1,11 +1,17 @@
+import { createHash } from 'node:crypto';
 import { mkdir, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import { HouseRefusal, retrying } from './api.js';
 import { relayed } from './relay.js';
+export function verified(bytes, sha256, name) {
+    if (createHash('sha256').update(bytes).digest('hex') !== sha256)
+        throw new Error(`${name} did not arrive whole; download it again`);
+    return bytes;
+}
 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}`);
@@ -16,7 +22,7 @@ export async function placeFiles(house, directory, files, signal) {
         });
         await mkdir(folder, { recursive: true });
         const path = join(folder, file.name);
-        await writeFile(path, Buffer.from(await answer.arrayBuffer()));
+        await writeFile(path, verified(Buffer.from(await answer.arrayBuffer()), file.sha256, file.name));
         paths.push(path);
     }
     return paths;