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

package/dist/copies.js

@@ -2,15 +2,15 @@ import { parse } from '@agentshouse/mdmodel';
 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 { HouseRefusal } from './api.js';
-import { blobId, blobText, git, HOUSE_REF, importCommits, revision, run, succeeded, tree, WORKING_COPIES, } from './git.js';
+import { finalRefusal, HouseRefusal, retrying } from './api.js';
+import { blobId, blobText, git, 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';
 import { changed } from './translate.js';
+import { relayed } from './relay.js';
 const BRANCH = 'main';
-const ROOM_HOMES = ['capture', 'library', 'collaboration'];
 const PROVENANCE = '_provenance';
-const REPLICA_RETRY_MS = 30_000;
 const IDENTITY = { GIT_COMMITTER_NAME: 'House Kit', GIT_COMMITTER_EMAIL: 'house-kit@localhost' };
 function causeOf(error) {
     return error instanceof Error ? error.message : String(error);
@@ -18,13 +18,16 @@ function causeOf(error) {
 function logged(error) {
     process.stderr.write(`kit: ${causeOf(error)}\n`);
 }
-export function refusalCode(text) {
-    try {
-        return String(JSON.parse(text).error.code);
-    }
-    catch {
-        return text.split(':')[0].trim();
-    }
+const REBASED = new Set([
+    'field_base_stale',
+    'section_base_stale',
+    'preamble_base_stale',
+    'base_revision_stale',
+    'path_exists',
+    'path_absent',
+]);
+function rebaseFixes(refusal) {
+    return refusal.code === 'edit_conflict' && refusal.conflicts.some((code) => REBASED.has(code));
 }
 function short(commit) {
     return commit.slice(0, 12);
@@ -37,14 +40,11 @@ function sidecar(path) {
     segments.splice(-1, 0, PROVENANCE);
     return segments.join('/');
 }
-function rootOf(copy) {
-    return copy.private ? '/private' : `/rooms/${copy.room_handle}`;
+function rootOf(handle) {
+    return `/rooms/${handle}`;
 }
 function relative(path) {
-    return path.replace(/^\/private\//, '').replace(/^\/rooms\/[^/]+\//, '');
-}
-function prefixesOf(selected) {
-    return selected.private ? ['/private'] : ROOM_HOMES.map((home) => `${rootOf(selected)}/${home}`);
+    return path.replace(/^\/rooms\/[^/]+\//, '');
 }
 function declaredWritable(path, copy) {
     const deepest = (scopes) => Math.max(-1, ...scopes.filter((scope) => covers(path, scope)).map((scope) => scope.length));
@@ -147,7 +147,7 @@ function movedPaths(moves, before, after) {
         .filter((pair) => pairs.filter((other) => other.from === pair.from || other.to === pair.to).length === 1)
         .map(({ from, to }) => [from, to]));
 }
-export class WorkingCopies {
+export class LocalCopies {
     owner;
     house;
     copies = new Map();
@@ -160,21 +160,23 @@ export class WorkingCopies {
             key: 'owner',
             submit: async (operation, changes) => {
                 try {
-                    const outcome = await house.post('/kit/door/batch', { operation_id: operation, changes });
+                    const outcome = await retrying(() => house.post('/kit/door/batch', { operation_id: operation, changes }));
                     return { accepted: outcome.contents };
                 }
                 catch (error) {
-                    if (!(error instanceof HouseRefusal) || error.status >= 500)
+                    if (!finalRefusal(error))
                         throw error;
-                    return { refused: { code: refusalCode(error.text), text: error.message } };
+                    return {
+                        refused: refusalOf(error.text) ?? { code: '', text: `House refused it with ${error.status}`, conflicts: [] },
+                    };
                 }
             },
         };
     }
     async load() {
-        const home = join(kitHome(), 'working-copies');
+        const home = join(kitHome(), 'local-copies');
         const names = (await readdir(join(home, 'rooms')).catch(() => [])).filter((name) => name.endsWith('.json'));
-        for (const path of [...names.map((name) => join(home, 'rooms', name)), join(home, 'private.json')]) {
+        for (const path of names.map((name) => join(home, 'rooms', name))) {
             const text = await readFile(path, 'utf8').catch(() => null);
             if (text === null)
                 continue;
@@ -186,7 +188,7 @@ export class WorkingCopies {
         await this.selecting;
         return [...this.copies.values()]
             .filter((copy) => copy.active)
-            .map((copy) => `${rootOf(copy)}: ${copy.repository}`)
+            .map((copy) => `${rootOf(copy.room_handle)}: ${copy.repository}`)
             .sort();
     }
     select() {
@@ -195,13 +197,8 @@ export class WorkingCopies {
         return selected;
     }
     async reselect() {
-        const { working_copy: chosen } = await this.house.post('/kit/working-copy/selection', {});
-        const selected = [
-            ...(chosen?.rooms ?? [])
-                .filter((room) => room.room_handle !== null)
-                .map((room) => ({ key: `rooms/${room.room_ref}`, private: false, handle: room.room_handle })),
-            ...(chosen?.private === true ? [{ key: 'private', private: true, handle: null }] : []),
-        ];
+        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()) {
@@ -253,11 +250,11 @@ export class WorkingCopies {
     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 in a Git repository` };
+            return { refused: true, text: `${cwd} is not a House Local copy; run house push inside one` };
         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 working copy` };
+            return { refused: true, text: `${worktree} is not a House Local copy; run house push inside one` };
         return this.exclusive(key, () => this.pushed(key, worktree, selector, caller));
     }
     async keyAt(repository) {
@@ -285,7 +282,7 @@ export class WorkingCopies {
         }).catch(logged);
     }
     async save(copy) {
-        const path = join(kitHome(), 'working-copies', copy.private ? 'private.json' : `${copy.key}.json`);
+        const path = join(kitHome(), 'local-copies', `${copy.key}.json`);
         await mkdir(dirname(path), { recursive: true, mode: 0o700 });
         const temporary = `${path}.${process.pid}`;
         await writeFile(temporary, JSON.stringify(copy), { mode: 0o600 });
@@ -293,12 +290,12 @@ export class WorkingCopies {
         this.copies.set(copy.key, copy);
         return copy;
     }
-    async read(selected) {
-        const prefixes = prefixesOf(selected);
+    async read(handle) {
+        const prefixes = [rootOf(handle)];
         const discovery = await this.house.post('/kit/door/discover', { prefixes });
         let bundle = await this.house.post('/kit/door/bootstrap', { prefixes });
         if ('transfer' in bundle)
-            bundle = (await (await fetch(bundle.transfer.url)).json());
+            bundle = (await (await fetch(relayed(bundle.transfer.url))).json());
         const [view] = bundle.scopes;
         if (view === undefined)
             return null;
@@ -341,13 +338,13 @@ export class WorkingCopies {
             return;
         }
         const discovery = await this.house.post('/kit/door/discover', {
-            prefixes: prefixesOf(copy),
+            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)} is not synchronized to this Environment`);
+            logged(`operation_denied: ${rootOf(copy.room_handle)} is not synchronized to this Environment`);
             return;
         }
         if (JSON.stringify([authority.operations.write, authority.protected_paths]) !==
@@ -358,12 +355,12 @@ export class WorkingCopies {
         await this.save(await this.caughtUp(copy));
     }
     async materialize(scope) {
-        const read = await this.read({ private: scope.private, room_handle: scope.handle });
+        const read = await this.read(scope.handle);
         if (read === null) {
-            logged(`House serves nothing of ${rootOf({ private: scope.private, room_handle: scope.handle })} to copy`);
+            logged(`House serves nothing of ${rootOf(scope.handle)} to copy`);
             return;
         }
-        const repository = scope.private ? join(WORKING_COPIES, 'private') : join(WORKING_COPIES, 'rooms', read.anchor);
+        const repository = join(localCopies(), 'rooms', read.anchor);
         if (await exists(repository)) {
             logged(`${repository} already exists and House Kit leaves it as it is`);
             return;
@@ -375,7 +372,7 @@ export class WorkingCopies {
         try {
             await git(staging, ['init', '-q', '-b', BRANCH]);
             house = await importCommits(staging, [
-                { message: `House ${rootOf({ private: scope.private, room_handle: scope.handle })}`, from: null, files: read.writable },
+                { message: `House ${rootOf(scope.handle)}`, from: null, files: read.writable },
             ]);
             await git(staging, ['update-ref', `refs/heads/${BRANCH}`, house]);
             await git(staging, ['reset', '-q', '--hard']);
@@ -389,7 +386,6 @@ export class WorkingCopies {
         }
         await this.save({
             key: scope.key,
-            private: scope.private,
             room_ref: read.anchor,
             room_handle: scope.handle,
             repository,
@@ -405,11 +401,11 @@ export class WorkingCopies {
         });
     }
     async received(copy) {
-        const read = await this.read(copy);
+        const read = await this.read(copy.room_handle);
         if (read === null)
             return copy;
         const house = await importCommits(copy.repository, [
-            { message: `House ${rootOf(copy)} at position ${read.position}`, from: copy.house, replaces: true, files: read.writable },
+            { message: `House ${rootOf(copy.room_handle)} at position ${read.position}`, from: copy.house, replaces: true, files: read.writable },
         ]);
         const removed = copy.read_only.filter((path) => !read.readOnly.has(path));
         const readOnly = await readOnlyPlaced(copy.repository, copy.read_only, read.readOnly, removed);
@@ -432,17 +428,16 @@ export class WorkingCopies {
             let answer;
             try {
                 answer = await this.house.post('/kit/door/enumerate', {
-                    prefixes: prefixesOf(copy),
+                    prefixes: [rootOf(copy.room_handle)],
                     positions: [{ authority: copy.room_ref, position: copy.position, log_epoch: copy.log_epoch }],
                 });
             }
             catch (error) {
-                const code = error instanceof HouseRefusal ? refusalCode(error.text) : null;
+                const code = error instanceof HouseRefusal ? (refusalOf(error.text)?.code ?? null) : null;
                 if (code === 'position_expired')
                     return this.received(copy);
                 if (code !== 'replica_behind')
                     throw error;
-                setTimeout(() => this.deliver(copy.key), REPLICA_RETRY_MS).unref();
                 return copy;
             }
             const view = answer.authorities.find((entry) => entry.authority === copy.room_ref);
@@ -482,7 +477,7 @@ export class WorkingCopies {
         let { house, manifests } = copy;
         if (files.size > 0) {
             house = await importCommits(copy.repository, [
-                { message: `House ${rootOf(copy)} at position ${position}`, from: copy.house, files },
+                { message: `House ${rootOf(copy.room_handle)} at position ${position}`, from: copy.house, files },
             ]);
             manifests = { ...manifests, [house]: { parent: copy.house, files: revisions } };
         }
@@ -512,8 +507,9 @@ export class WorkingCopies {
             }
             copy = await this.save(without(copy));
         }
-        if (!copy.active)
-            return { refused: true, text: `${rootOf(copy)} is no longer kept in this Environment` };
+        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) {
@@ -546,7 +542,7 @@ export class WorkingCopies {
         return this.settle(submitted, caller);
     }
     async derived(copy, base, commit) {
-        const root = rootOf(copy);
+        const root = rootOf(copy.room_handle);
         const before = await tree(copy.repository, base);
         const after = await tree(copy.repository, commit);
         const moved = movedPaths(copy.moves, before, after);
@@ -582,9 +578,8 @@ export class WorkingCopies {
     async settle(start, caller, restaged = false) {
         let copy = start;
         const push = copy.push;
-        if (push.caller !== caller.key) {
-            return this.recovered(copy, `${short(push.commit)} was pushed by another caller and awaited its outcome`);
-        }
+        if (push.caller !== caller.key)
+            return this.recovered(copy);
         let outcome;
         try {
             outcome = await caller.submit(push.operation_id, push.changes, push.upload, async (upload) => {
@@ -592,9 +587,10 @@ export class WorkingCopies {
             });
         }
         catch (error) {
+            const refusal = error instanceof HouseRefusal ? refusalOf(error.text) : null;
             return {
                 refused: true,
-                text: `House's answer to ${short(push.commit)} did not arrive (${causeOf(error)}); run house git push again to recover its outcome.`,
+                text: refusal?.text ?? `House's answer to ${short(push.commit)} did not arrive; run house push again`,
             };
         }
         if ('refused' in outcome) {
@@ -603,31 +599,37 @@ export class WorkingCopies {
                 return this.settle(await this.save({ ...copy, push: unstaged }), caller, true);
             }
             if (outcome.refused.code === 'operation_expired')
-                return this.recovered(copy, outcome.refused.text);
+                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));
             }
-            catch (error) {
-                return { refused: true, text: `${outcome.refused.text}\n${HOUSE_REF} is unchanged: ${causeOf(error)}` };
+            catch {
+                return {
+                    refused: true,
+                    text: rebased ? `${outcome.refused.text}\nHouse's current state did not arrive; push again later` : outcome.refused.text,
+                };
             }
             return {
                 refused: true,
-                text: `${outcome.refused.text}\n${HOUSE_REF} holds House's current state; merge or rebase onto it, commit and push again.`,
+                text: rebased
+                    ? `${outcome.refused.text}\n${HOUSE_REF} holds House's current state; rebase onto it and push again`
+                    : outcome.refused.text,
             };
         }
         return this.finished(await this.save({ ...copy, push: { ...copy.push, state: 'accepted', written: outcome.accepted } }));
     }
-    async recovered(copy, reason) {
+    async recovered(copy) {
         const push = copy.push;
         const current = await this.save(await this.caughtUp(copy));
         const house = await tree(copy.repository, current.house);
-        const root = rootOf(current);
+        const root = rootOf(current.room_handle);
         if (!(await this.landed(copy.repository, push.changes, house, await tree(copy.repository, push.commit)))) {
             await this.save(without(current));
             return {
                 refused: true,
-                text: `${reason}; House does not hold ${short(push.commit)}; run house git push again to submit it as a new operation.`,
+                text: `House does not hold ${short(push.commit)}; run house push again`,
             };
         }
         const written = [];
@@ -652,10 +654,10 @@ export class WorkingCopies {
                 await this.save(without(copy));
             return { refused: false, text: integrated.text };
         }
-        catch (error) {
+        catch {
             return {
                 refused: false,
-                text: `House accepted ${short(commit)}; local integration is pending (${causeOf(error)}); run house git push again to finish it.`,
+                text: `House accepted ${short(commit)}; run house push again to finish integrating it here`,
             };
         }
     }
@@ -678,7 +680,7 @@ export class WorkingCopies {
                 written = [
                     ...written,
                     {
-                        path: `${rootOf(copy)}/${path}`,
+                        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),
                     },
@@ -698,7 +700,7 @@ export class WorkingCopies {
         }
         const edits = new Map([...files].filter(([path, content]) => (content === null ? selected.has(path) : selected.get(path) !== blobId(content))));
         const received = [...files.keys()].filter((path) => revisionAt(copy, copy.house, path) === revisionAt(copy, push.house, path));
-        const accepted = `House ${rootOf(copy)} with ${push.commit} accepted`;
+        const accepted = `House ${rootOf(copy.room_handle)} with ${push.commit} accepted`;
         const house = await importCommits(copy.repository, [
             ...(edits.size === 0 ? [] : [{ message: accepted, from: push.commit, files: edits }]),
             {

package/dist/end.js

@@ -0,0 +1,8 @@
+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) {
+    process.stderr.write(`kit: ${reason}\n`);
+    killDescendants();
+    process.exit(0);
+}