@agentshouse/kit 0.2.1-c7f53ff9eaf98 → 0.2.1-c84a4fccf2835

package/dist/bootstrap.json

@@ -1,23 +1,23 @@
 {
   "schemaVersion": 2,
-  "version": "0.2.1-c7f53ff9eaf98",
+  "version": "0.2.1-c84a4fccf2835",
   "hosts": {
     "macos": {
       "asset": {
         "name": "connect-linux.sh",
-        "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-c7f53ff9eaf98/connect-linux.sh"
+        "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-c84a4fccf2835/connect-linux.sh"
       }
     },
     "linux": {
       "asset": {
         "name": "connect-linux.sh",
-        "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-c7f53ff9eaf98/connect-linux.sh"
+        "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-c84a4fccf2835/connect-linux.sh"
       }
     },
     "windows": {
       "asset": {
         "name": "connect-windows.ps1",
-        "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-c7f53ff9eaf98/connect-windows.ps1"
+        "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-c84a4fccf2835/connect-windows.ps1"
       }
     }
   }

package/dist/bridge.js

@@ -81,7 +81,7 @@ function editAnswer(forwarded) {
 export async function openBridge(house, copies, conversationId, signal) {
     const path = [join(kitHome(), 'shim'), dirname(process.execPath), await loginPath()].join(delimiter);
     const origin = (await readEnrolment()).house;
-    const { credential } = await house.post(`/kit/conversations/${conversationId}/credential`, {}, signal);
+    const { credential } = await retrying(() => house.post(`/kit/conversations/${conversationId}/credential`, {}, signal), signal);
     const closed = new AbortController();
     const sent = (message, operation) => callHouse(origin, credential, message, operation, closed.signal);
     const send = async (message, operation) => {

package/dist/conversations.js

@@ -4,6 +4,7 @@ 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 { answeredFailure, readerFor } from './events.js';
@@ -11,6 +12,7 @@ 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';
@@ -19,7 +21,13 @@ 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 Kit could not open this conversation's connection";
+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";
@@ -31,9 +39,12 @@ async function step(reason, work) {
         return await work;
     }
     catch (error) {
-        throw new NotStarted(reason, { cause: 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)) {
@@ -119,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) {
@@ -130,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;
@@ -395,7 +393,7 @@ export class Conversations {
             .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 step(NO_CONNECTION, 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);

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/inputs.js

@@ -0,0 +1,37 @@
+function logged(error) {
+    process.stderr.write(`kit: ${error instanceof Error ? error.message : String(error)}\n`);
+}
+export class Inputs {
+    house;
+    changed;
+    carried = new Map();
+    open = 0;
+    constructor(house, changed) {
+        this.house = house;
+        this.changed = changed;
+    }
+    idle() {
+        return this.open === 0;
+    }
+    carry(inputId, work) {
+        const known = this.carried.get(inputId);
+        const carried = known ?? work();
+        if (known === undefined) {
+            this.carried.set(inputId, carried);
+            carried.catch(() => this.carried.delete(inputId));
+        }
+        this.open++;
+        this.changed();
+        return carried
+            .then(async ({ ack, acknowledged }) => {
+            await this.house.deliver(`/kit/inputs/${inputId}/ack`, ack);
+            if (known === undefined)
+                await acknowledged?.();
+        })
+            .catch(logged)
+            .finally(() => {
+            this.open--;
+            this.changed();
+        });
+    }
+}

package/dist/resident.js

@@ -12,6 +12,7 @@ import { CONVERSATION_INPUTS, Conversations } from './conversations.js';
 import { LocalCopies } from './copies.js';
 import { restart } from './end.js';
 import { agentBase, enrolled, forgetRestart, kitHome, ownerLock, ownerSocket, restartAsked } from './home.js';
+import { Inputs } from './inputs.js';
 import { killDescendants } from './scope.js';
 import { quoted } from './shell.js';
 import { SignIns } from './sign-in.js';
@@ -133,7 +134,7 @@ export async function resident() {
     const agents = new Agents(house, () => changed());
     let stream = null;
     let reported = false;
-    const idle = () => conversations.idle() && signIns.idle() && agents.idle();
+    const idle = () => inputs.idle() && conversations.idle() && agents.idle();
     const changed = () => {
         if (!idle()) {
             reported = false;
@@ -146,15 +147,17 @@ export async function resident() {
             logged(house.deliver('/kit/idle', {}, idle));
         }
     };
+    const inputs = new Inputs(house, changed);
     const conversations = new Conversations({
         house,
         agents,
         copies,
+        inputs,
         send: (frame) => stream?.send(frame) ?? false,
         changed,
     });
-    const signIns = new SignIns(house, agents, changed);
-    const updates = new Updates(house);
+    const signIns = new SignIns(house, agents, inputs);
+    const updates = new Updates(inputs);
     for (const signal of ['SIGTERM', 'SIGINT']) {
         process.once(signal, () => {
             killDescendants();
@@ -178,7 +181,6 @@ export async function resident() {
             if (arrived.type === 'work_available' && arrived.subject === 'agents')
                 logged(agents.refresh());
             if (arrived.type === 'input') {
-                reported = false;
                 if (arrived.kind === 'sign_in')
                     signIns.start(arrived);
                 else if (arrived.kind === 'update')
@@ -187,7 +189,7 @@ export async function resident() {
                     conversations.input(arrived);
                 else {
                     const refused = { refused: `This Kit does not know ${arrived.kind}; update the Kit` };
-                    logged(house.deliver(`/kit/inputs/${arrived.input_id}/ack`, refused).finally(changed));
+                    void inputs.carry(String(arrived.input_id), async () => ({ ack: refused }));
                 }
             }
         },

package/dist/sign-in.js

@@ -9,36 +9,20 @@ const CODE = /^[A-Z0-9]+-[A-Z0-9]+$/;
 function causeOf(error) {
     return error instanceof Error ? error.message : String(error);
 }
-function logged(error) {
-    process.stderr.write(`kit: ${causeOf(error)}\n`);
-}
 function endOf(signal) {
     return new Promise((resolve) => signal.addEventListener('abort', () => resolve(true), { once: true }));
 }
 export class SignIns {
     house;
     agents;
-    changed;
-    running = new Set();
-    constructor(house, agents, changed) {
+    inputs;
+    constructor(house, agents, inputs) {
         this.house = house;
         this.agents = agents;
-        this.changed = changed;
-    }
-    idle() {
-        return this.running.size === 0;
+        this.inputs = inputs;
     }
     start(input) {
-        if (this.running.has(input.input_id))
-            return;
-        this.running.add(input.input_id);
-        this.changed();
-        this.signIn(input)
-            .catch(logged)
-            .finally(() => {
-            this.running.delete(input.input_id);
-            this.changed();
-        });
+        void this.inputs.carry(input.input_id, () => this.signIn(input));
     }
     async signIn(input) {
         const ending = new AbortController();
@@ -48,9 +32,7 @@ export class SignIns {
         clearTimeout(timer);
         if (ended)
             process.stderr.write(`kit: the ${input.cli} sign-in reached the end House set for it\n`);
-        await this.house.deliver(`/kit/inputs/${input.input_id}/ack`, {});
-        if (!ended)
-            await this.agents.reread(input.cli);
+        return ended ? { ack: {} } : { ack: {}, acknowledged: () => this.agents.reread(input.cli) };
     }
     async signedIn(input, signal) {
         await this.login(input, signal);

package/dist/update.js

@@ -6,9 +6,6 @@ import { join } from 'node:path';
 import { run } from './clis.js';
 import { kitHome, workspaceRoot } from './home.js';
 import { service, throughSudo } from './placement.js';
-function logged(error) {
-    process.stderr.write(`kit: ${error instanceof Error ? error.message : String(error)}\n`);
-}
 function directory() {
     return join(kitHome(), 'update');
 }
@@ -50,6 +47,12 @@ async function recorded() {
         return null;
     return status.trim() === '0' ? {} : { refused: `the Kit bootstrap exited with ${status.trim()}` };
 }
+async function forget(inputId) {
+    if ((await pendingInput()) !== inputId)
+        return;
+    await rm(pending(), { force: true });
+    await rm(outcome(), { force: true });
+}
 async function finished(inputId) {
     for (;;) {
         const ack = await recorded();
@@ -90,27 +93,28 @@ function rerun(script, inputId, flags) {
     });
 }
 export class Updates {
-    house;
-    held = new Set();
+    inputs;
     queue = Promise.resolve();
-    constructor(house) {
-        this.house = house;
+    constructor(inputs) {
+        this.inputs = inputs;
     }
     async resumed() {
         const inputId = await pendingInput();
         if (inputId === null)
             return;
-        await this.acknowledge(inputId, await finished(inputId));
+        await this.enqueue(inputId, () => finished(inputId));
     }
     start(input) {
-        if (this.held.has(input.input_id))
-            return;
-        this.held.add(input.input_id);
-        this.queue = this.queue
-            .then(() => this.carry(input))
-            .then((ack) => this.acknowledge(input.input_id, ack))
-            .catch(logged)
-            .finally(() => this.held.delete(input.input_id));
+        void this.enqueue(input.input_id, () => this.carry(input));
+    }
+    enqueue(inputId, work) {
+        const before = this.queue;
+        const carried = this.inputs.carry(inputId, async () => {
+            await before;
+            return { ack: await work(), acknowledged: () => forget(inputId) };
+        });
+        this.queue = before.then(() => carried);
+        return carried;
     }
     async carry(input) {
         if ((await pendingInput()) === input.input_id)
@@ -131,11 +135,4 @@ export class Updates {
             refused: 'the Kit bootstrap did not finish',
         };
     }
-    async acknowledge(inputId, ack) {
-        await this.house.deliver(`/kit/inputs/${inputId}/ack`, ack);
-        if ((await pendingInput()) !== inputId)
-            return;
-        await rm(pending(), { force: true });
-        await rm(outcome(), { force: true });
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentshouse/kit",
-  "version": "0.2.1-c7f53ff9eaf98",
+  "version": "0.2.1-c84a4fccf2835",
   "description": "House Kit connects an Environment to agents.house.",
   "license": "MIT",
   "repository": {