@agentshouse/kit 0.2.1-c3cf4b145dcda → 0.2.1-c46722ad48058

package/dist/conversations.js

@@ -3,7 +3,7 @@ import { createHash, randomUUID } from 'node:crypto';
 import { mkdir } from 'node:fs/promises';
 import { join } from 'node:path';
 import { unlessAborted } from './abort.js';
-import { killMarked, processes, startAdapter } from './acp.js';
+import { startAdapter } from './acp.js';
 import { openBridge } from './bridge.js';
 import { CLIS } from './clis.js';
 import { readerFor } from './events.js';
@@ -11,12 +11,12 @@ import { placeFiles, uploadBytes } from './files.js';
 import { agentBase } from './home.js';
 import { instructions } from './instructions.js';
 import { Parts } from './parts.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 KILLED = 'the conversation was killed';
-// A process a conversation left running reports nothing when it exits, so the Kit looks again every five seconds while one runs.
-const PROCESS_RECHECK_MS = 5000;
 function causeOf(error) {
     return error instanceof Error ? error.message : String(error);
 }
@@ -29,9 +29,6 @@ function logged(error) {
 function marker(bridge) {
     return `HOUSE_BRIDGE=${bridge.env.HOUSE_BRIDGE}`;
 }
-function stop(bridge) {
-    killMarked(marker(bridge));
-}
 class Turn {
     id = randomUUID();
     parts;
@@ -53,7 +50,7 @@ class Conversation {
     turn = null;
     commands = null;
     context = null;
-    busy = new Set();
+    leftovers = new Set();
     waiting = [];
     sending = null;
     subagents = new Map();
@@ -86,9 +83,10 @@ export class Conversations {
     carrying = 0;
     reporting = 0;
     watched = false;
-    recheck = null;
     constructor(kit) {
         this.kit = kit;
+        // A process or a durable schedule ends without a report, so the Kit looks at both again every two seconds.
+        setInterval(() => this.look(), 2_000);
     }
     input(input) {
         this.carrying++;
@@ -126,22 +124,24 @@ export class Conversations {
         for (const conversation of this.conversations.values()) {
             const turn = conversation.turn;
             const asking = turn !== null && turn.questions > 0 && turn.secrets === 0;
-            if (conversation.busy.size > 0 || conversation.open > (asking ? 1 : 0))
+            if (conversation.open > (asking ? 1 : 0))
                 return false;
         }
-        for (const conversation of this.conversations.values()) {
-            const running = conversation.running;
-            if (running === null || running.baseline === null)
-                continue;
-            if ([...processes(marker(running.bridge))].every((found) => running.baseline.has(found)))
-                continue;
-            this.recheck ??= setTimeout(() => {
-                this.recheck = null;
-                this.kit.changed();
-            }, PROCESS_RECHECK_MS);
+        const conversations = [...this.conversations.values()];
+        if (conversations.some((conversation) => conversation.running?.work.busy()))
             return false;
+        return !conversations.some((conversation) => conversation.running?.scope.working() || [...conversation.leftovers].some((scope) => scope.working()));
+    }
+    look() {
+        for (const conversation of this.conversations.values()) {
+            for (const scope of conversation.leftovers) {
+                if (!scope.empty())
+                    continue;
+                scope.close();
+                conversation.leftovers.delete(scope);
+            }
         }
-        return true;
+        this.kit.changed();
     }
     opened() {
         this.watched = false;
@@ -295,11 +295,13 @@ export class Conversations {
     }
     halt(conversation) {
         if (conversation.opening !== null)
-            stop(conversation.opening);
+            killMarked(marker(conversation.opening));
+        for (const scope of conversation.leftovers)
+            scope.kill();
         if (conversation.running === null)
             return;
         conversation.running.killed = true;
-        stop(conversation.running.bridge);
+        conversation.running.scope.kill();
     }
     async kill(conversation) {
         const running = conversation.running;
@@ -350,22 +352,30 @@ export class Conversations {
             throw new Error(KILLED);
         }
         conversation.opening = bridge;
+        const work = workFor(route.kind, route.working_directory, () => this.kit.changed());
+        const scope = new Scope(marker(bridge), randomUUID(), cli);
         try {
             await unlessAborted(createHowWeWork(bridge), conversation.killed.signal);
-            await CLIS[route.kind].allowHouse();
-            conversation.busy.clear();
-            const adapter = await startAdapter(route.kind, cli, route.working_directory, app, (message) => this.read(conversation, reader, message), bridge.env);
+            await CLIS[route.kind].allowHouse(bridge.env.PATH);
+            const adapter = await 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);
             void adapter.exited.then(() => bridge.close());
             const agent = adapter.connection.agent;
             const cwd = route.working_directory;
-            const _meta = CLIS[route.kind].sessionMeta;
+            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 };
             reader.session = opened.sessionId;
-            const running = { adapter, bridge, sessionId: opened.sessionId, killed: false, reader, baseline: null };
+            if (sessionId === null && CLIS[route.kind].renames) {
+                const prompt = [{ type: 'text', text: `/rename ${conversation.id}` }];
+                await 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 ?? []);
-            running.baseline = processes(marker(bridge));
+            void work.settled().then(() => scope.record());
             conversation.running = running;
             conversation.session = running.sessionId;
             this.kit.send({ type: 'process', conversation_id: conversation.id, running: true });
@@ -376,7 +386,9 @@ export class Conversations {
             return running.sessionId;
         }
         catch (error) {
-            stop(bridge);
+            scope.kill();
+            work.close();
+            conversation.leftovers.add(scope);
             bridge.close();
             throw conversation.kills > 0 ? new Error(KILLED) : error;
         }
@@ -409,17 +421,18 @@ export class Conversations {
         const running = conversation.running;
         if (running?.adapter !== adapter)
             return;
-        this.detach(conversation);
+        this.detach(conversation, running);
         if (conversation.turn !== null) {
             this.end(conversation, conversation.turn, { failed: running.killed ? KILLED : cause });
         }
         this.next(conversation);
         this.kit.changed();
     }
-    detach(conversation) {
+    detach(conversation, running) {
+        running.work.close();
+        conversation.leftovers.add(running.scope);
         conversation.running = null;
         conversation.commands = null;
-        conversation.busy.clear();
         for (const [id, question] of this.questions) {
             if (question.conversation === conversation)
                 this.questions.delete(id);
@@ -471,8 +484,6 @@ export class Conversations {
             turn.parts.measure(conversation.context);
         for (const part of conversation.held.splice(0))
             turn.parts.start(part);
-        for (const event of conversation.running?.reader.turnStarted() ?? [])
-            this.event(conversation, event);
         this.kit.changed();
         return turn;
     }
@@ -506,8 +517,8 @@ export class Conversations {
             }
             else {
                 if (conversation.open === 1 && conversation.running === running) {
-                    stop(running.bridge);
-                    this.detach(conversation);
+                    running.scope.kill();
+                    this.detach(conversation, running);
                 }
                 this.end(conversation, turn, { failed: causeOf(error) });
             }
@@ -592,20 +603,6 @@ export class Conversations {
             case 'options':
                 this.options(conversation, event.options);
                 return;
-            case 'busy':
-                if (event.running)
-                    conversation.busy.add(event.key);
-                else
-                    conversation.busy.delete(event.key);
-                this.kit.changed();
-                return;
-            case 'servers': {
-                const running = conversation.running;
-                if (running?.baseline)
-                    for (const found of processes(marker(running.bridge)))
-                        running.baseline.add(found);
-                return;
-            }
             case 'context':
                 conversation.context = { used: event.used, window: event.window };
                 conversation.turn?.parts.measure(conversation.context);

package/dist/copies.js

@@ -32,6 +32,22 @@ function rebaseFixes(refusal) {
 function short(commit) {
     return commit.slice(0, 12);
 }
+function moved(before, after) {
+    if (before.house !== after.house)
+        return [`${rootOf(after.room_handle)}: ${HOUSE_REF} is at ${short(after.house)}`];
+    return before.position === after.position ? [] : [`${rootOf(after.room_handle)}: read-only files refreshed`];
+}
+function expiredAuthority(error) {
+    if (!(error instanceof HouseRefusal))
+        return undefined;
+    try {
+        const { error: refused } = JSON.parse(error.text);
+        return refused?.code === 'expired' && typeof refused.authority === 'string' ? refused.authority : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 function covers(path, prefix) {
     return prefix === '' || path === prefix || path.startsWith(`${prefix}/`);
 }
@@ -152,8 +168,7 @@ export class LocalCopies {
     house;
     copies = new Map();
     queues = new Map();
-    delivering = new Set();
-    selecting = Promise.resolve();
+    answering = Promise.resolve();
     constructor(house) {
         this.house = house;
         this.owner = {
@@ -185,42 +200,68 @@ export class LocalCopies {
         }
     }
     async mapping() {
-        await this.selecting;
+        await this.answering;
         return [...this.copies.values()]
             .filter((copy) => copy.active)
             .map((copy) => `${rootOf(copy.room_handle)}: ${copy.repository}`)
             .sort();
     }
-    select() {
-        const selected = this.selecting.then(() => this.reselect());
-        this.selecting = selected.catch(() => undefined);
-        return selected;
-    }
-    async reselect() {
-        const { local_copy: chosen } = await this.house.post('/kit/local-copy/selection', {});
-        const selected = (chosen?.rooms ?? []).flatMap((room) => room.room_handle === null ? [] : [{ key: `rooms/${room.room_ref}`, handle: room.room_handle }]);
-        const keys = new Set(selected.map((scope) => scope.key));
-        const work = [];
-        for (const key of this.copies.keys()) {
-            if (keys.has(key))
-                continue;
-            work.push(this.exclusive(key, async () => {
-                const copy = this.copies.get(key);
-                if (copy.active)
-                    await this.save({ ...copy, active: false });
-            }));
-        }
-        for (const scope of selected)
-            work.push(this.exclusive(scope.key, () => this.apply(scope)).catch(logged));
-        await Promise.all(work);
+    async connected() {
+        const copied = await this.answered(() => this.fetched(false));
+        if (copied.refused)
+            logged(copied.text);
     }
-    entries(frame) {
-        const copy = [...this.copies.values()].find((held) => held.active && held.room_ref === frame.authority);
-        if (copy === undefined)
-            return;
-        if (copy.log_epoch === frame.log_epoch && BigInt(frame.position) <= BigInt(copy.position))
-            return;
-        this.deliver(copy.key);
+    fetch() {
+        return this.answered(() => this.fetched(true));
+    }
+    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', {});
+        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 said = [];
+            let refused = false;
+            for (const copy of this.copies.values()) {
+                if (synced.has(copy.key) || !copy.active)
+                    continue;
+                await this.save({ ...copy, active: false });
+                said.push(`${rootOf(copy.room_handle)}: no longer synced to this Environment; its files stay`);
+            }
+            const current = [];
+            for (const [key, handle] of synced) {
+                try {
+                    const held = this.copies.get(key);
+                    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 }))));
+                }
+                catch (error) {
+                    refused = true;
+                    said.push(`${rootOf(handle)}: ${causeOf(error)}`);
+                }
+            }
+            if (refreshing && current.length > 0) {
+                try {
+                    const refreshed = await this.refreshed(current);
+                    current.forEach((copy, index) => said.push(...moved(copy, refreshed[index])));
+                }
+                catch (error) {
+                    refused = true;
+                    said.push(error instanceof HouseRefusal ? (refusalOf(error.text)?.text ?? causeOf(error)) : causeOf(error));
+                }
+            }
+            return { refused, text: said.length === 0 ? 'Nothing new from House.' : said.join('\n') };
+        });
     }
     async observed(report) {
         const key = await this.keyAt(dirname(report.common));
@@ -270,16 +311,9 @@ export class LocalCopies {
         this.queues.set(key, queued.catch(() => undefined));
         return queued;
     }
-    deliver(key) {
-        if (this.delivering.has(key))
-            return;
-        this.delivering.add(key);
-        void this.exclusive(key, async () => {
-            this.delivering.delete(key);
-            const copy = this.copies.get(key);
-            if (copy.active)
-                await this.save(await this.caughtUp(copy));
-        }).catch(logged);
+    holding(keys, work) {
+        const [key, ...rest] = keys;
+        return key === undefined ? work() : this.exclusive(key, () => this.holding(rest, work));
     }
     async save(copy) {
         const path = join(kitHome(), 'local-copies', `${copy.key}.json`);
@@ -325,46 +359,13 @@ export class LocalCopies {
         }
         return read;
     }
-    async apply(scope) {
-        let copy = this.copies.get(scope.key);
-        if (copy === undefined || !(await exists(copy.repository))) {
-            await this.materialize(scope);
-            return;
-        }
-        if (copy.room_handle !== scope.handle)
-            copy = await this.save({ ...copy, room_handle: scope.handle });
-        if (!copy.active) {
-            await this.save(await this.received({ ...copy, active: true }));
-            return;
-        }
-        const discovery = await this.house.post('/kit/door/discover', {
-            prefixes: [rootOf(copy.room_handle)],
-        });
-        const authority = discovery.authorities.find((entry) => entry.room_ref === copy.room_ref);
-        if (authority === undefined)
-            return;
-        if (authority.managed_replication !== 'admitted') {
-            logged(`operation_denied: ${rootOf(copy.room_handle)} is not synchronized to this Environment`);
-            return;
-        }
-        if (JSON.stringify([authority.operations.write, authority.protected_paths]) !==
-            JSON.stringify([copy.write, copy.protected])) {
-            await this.save(await this.received(copy));
-            return;
-        }
-        await this.save(await this.caughtUp(copy));
-    }
-    async materialize(scope) {
-        const read = await this.read(scope.handle);
-        if (read === null) {
-            logged(`House serves nothing of ${rootOf(scope.handle)} to copy`);
-            return;
-        }
+    async materialize(key, handle) {
+        const read = await this.read(handle);
+        if (read === null)
+            throw new Error('House serves nothing of it to copy');
         const repository = join(localCopies(), 'rooms', read.anchor);
-        if (await exists(repository)) {
-            logged(`${repository} already exists and House Kit leaves it as it is`);
-            return;
-        }
+        if (await exists(repository))
+            throw new Error(`${repository} already exists and House Kit leaves it as it is`);
         const staging = join(dirname(repository), `.${randomUUID()}`);
         await mkdir(staging, { recursive: true });
         let house;
@@ -372,7 +373,7 @@ export class LocalCopies {
         try {
             await git(staging, ['init', '-q', '-b', BRANCH]);
             house = await importCommits(staging, [
-                { message: `House ${rootOf(scope.handle)}`, from: null, files: read.writable },
+                { message: `House ${rootOf(handle)}`, from: null, files: read.writable },
             ]);
             await git(staging, ['update-ref', `refs/heads/${BRANCH}`, house]);
             await git(staging, ['reset', '-q', '--hard']);
@@ -385,9 +386,9 @@ export class LocalCopies {
             throw error;
         }
         await this.save({
-            key: scope.key,
+            key,
             room_ref: read.anchor,
-            room_handle: scope.handle,
+            room_handle: handle,
             repository,
             active: true,
             house,
@@ -399,6 +400,7 @@ export class LocalCopies {
             manifests: { [house]: { parent: null, files: read.revisions } },
             moves: [],
         });
+        return `${rootOf(handle)}: copied to ${repository}`;
     }
     async received(copy) {
         const read = await this.read(copy.room_handle);
@@ -422,29 +424,52 @@ export class LocalCopies {
         await ignoreRules(copy.repository, [...read.writable.keys()], next);
         return next;
     }
-    async caughtUp(start) {
-        let copy = start;
-        for (;;) {
+    async refreshed(copies) {
+        const discovery = await this.house.post('/kit/door/discover', {
+            prefixes: copies.map((copy) => rootOf(copy.room_handle)),
+        });
+        const regranted = new Map();
+        for (const copy of copies) {
+            const authority = discovery.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)));
+            }
+        }
+        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));
+    }
+    async caughtUp(copies, whole) {
+        const caught = new Map(copies.map((copy) => [copy.key, copy]));
+        let asking = [...copies];
+        while (asking.length > 0) {
             let answer;
             try {
                 answer = await this.house.post('/kit/door/enumerate', {
-                    prefixes: [rootOf(copy.room_handle)],
-                    positions: [{ authority: copy.room_ref, position: copy.position, log_epoch: copy.log_epoch }],
+                    prefixes: asking.map((copy) => rootOf(copy.room_handle)),
+                    positions: asking.map((copy) => ({ authority: copy.room_ref, position: copy.position, log_epoch: copy.log_epoch })),
                 });
             }
             catch (error) {
-                const code = error instanceof HouseRefusal ? (refusalOf(error.text)?.code ?? null) : null;
-                if (code === 'position_expired')
-                    return this.received(copy);
-                if (code !== 'replica_behind')
+                const expired = asking.find((copy) => copy.room_ref === expiredAuthority(error));
+                if (expired === undefined)
                     throw error;
-                return copy;
+                caught.set(expired.key, await this.save(await this.received(expired)));
+                asking = asking.filter((copy) => copy !== expired);
+                continue;
+            }
+            const advanced = [];
+            for (const copy of asking) {
+                const view = answer.authorities.find((entry) => entry.authority === copy.room_ref);
+                if (view === undefined || (view.position === copy.position && view.log_epoch === copy.log_epoch))
+                    continue;
+                const next = await this.save(await this.incorporated(copy, view.changes, view.position, view.log_epoch));
+                caught.set(copy.key, next);
+                advanced.push(next);
             }
-            const view = answer.authorities.find((entry) => entry.authority === copy.room_ref);
-            if (view === undefined || (view.position === copy.position && view.log_epoch === copy.log_epoch))
-                return copy;
-            copy = await this.save(await this.incorporated(copy, view.changes, view.position, view.log_epoch));
+            asking = whole ? advanced : [];
         }
+        return copies.map((copy) => caught.get(copy.key));
     }
     async incorporated(copy, changes, position, logEpoch) {
         const houseTree = await tree(copy.repository, copy.house);
@@ -598,12 +623,12 @@ export class LocalCopies {
                 const { upload, ...unstaged } = copy.push;
                 return this.settle(await this.save({ ...copy, push: unstaged }), caller, true);
             }
-            if (outcome.refused.code === 'operation_expired')
+            if (outcome.refused.code === 'expired')
                 return this.recovered(copy);
             const rebased = rebaseFixes(outcome.refused);
             let settled = await this.save(without(copy));
             try {
-                settled = await this.save(await this.caughtUp(settled));
+                settled = (await this.caughtUp([settled], true))[0];
             }
             catch {
                 return {
@@ -622,7 +647,7 @@ export class LocalCopies {
     }
     async recovered(copy) {
         const push = copy.push;
-        const current = await this.save(await this.caughtUp(copy));
+        const current = (await this.caughtUp([copy], true))[0];
         const house = await tree(copy.repository, current.house);
         const root = rootOf(current.room_handle);
         if (!(await this.landed(copy.repository, push.changes, house, await tree(copy.repository, push.commit)))) {
@@ -666,7 +691,7 @@ export class LocalCopies {
         const push = copy.push;
         let written = push.written;
         if (push.changes.some((change) => change.op === 'rename')) {
-            copy = await this.save(await this.caughtUp(copy));
+            copy = (await this.caughtUp([copy], true))[0];
             const house = await tree(copy.repository, copy.house);
             const sent = await tree(copy.repository, push.house);
             if (push.changes.some((change) => change.op === 'rename' && !house.has(relative(change.to)))) {

package/dist/end.js

@@ -1,4 +1,4 @@
-import { killDescendants } from './acp.js';
+import { killDescendants } from './scope.js';
 export const REPLACED = 'another Kit started for this Environment';
 export const SIGN_IN_AGAIN = 'sign in again';
 export function end(reason) {

package/dist/enrol-main.js

@@ -1,4 +1,10 @@
 import { readFileSync } from 'node:fs';
 import { writeEnrolment } from './home.js';
 const [house, environment] = process.argv.slice(2);
-await writeEnrolment({ house: house, environment: environment, credential: readFileSync(0, 'utf8').trim() });
+const relay = process.env.HOUSE_KIT_RELAY || undefined;
+await writeEnrolment({
+    house: house,
+    ...(relay === undefined ? {} : { relay }),
+    environment: environment,
+    credential: readFileSync(0, 'utf8').trim(),
+});