@agentshouse/kit 0.2.1-c845e172df1af → 0.2.1-c849d8d4ab62f

package/dist/conversations.js

@@ -1,14 +1,14 @@
-import { client, RequestError, } from '@agentclientprotocol/sdk';
+import { client, } 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 { signedOut, startAdapter } from './acp.js';
 import { finalRefusal, HouseRefusal } from './api.js';
 import { openBridge } from './bridge.js';
 import { CLIS } from './clis.js';
 import { answeredFailure, readerFor } from './events.js';
-import { placeFiles, storeRefusal, uploaded } from './files.js';
+import { inspectedFile, linkedPaths, storeRefusal, uploaded } from './files.js';
 import { agentBase } from './home.js';
 import { instructions } from './instructions.js';
 import { Parts } from './parts.js';
@@ -16,11 +16,10 @@ import { refusalOf } from './refusals.js';
 import { relayed } from './relay.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 INTERRUPTED = 'the conversation was interrupted';
 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';
@@ -34,8 +33,11 @@ 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 NOT_SIGNED_IN = "the Agent's CLI is not signed in; sign it in on the Agent's machine";
 const NO_SETTINGS = "the Agent's CLI refused the Agent's model, mode or effort";
+const UNSTEERED = "the Agent's CLI did not take the message into its running turn";
 class NotStarted extends Error {
 }
+class ResumeRefused extends NotStarted {
+}
 async function step(reason, work) {
     try {
         return await work;
@@ -44,9 +46,6 @@ async function step(reason, work) {
         throw new NotStarted(typeof reason === 'string' ? reason : reason(error), { cause: error });
     }
 }
-function signedOut(error) {
-    return typeof error === 'object' && error !== null && error.code === SIGNED_OUT;
-}
 function unopened(reason) {
     return (error) => (signedOut(error) ? NOT_SIGNED_IN : reason);
 }
@@ -63,7 +62,7 @@ const EXIT_PLAN_MODE = {
         return value;
     },
 };
-export const CONVERSATION_METHODS = new Set(['open', 'message', 'interrupt', 'kill', 'option', 'answer']);
+export const CONVERSATION_METHODS = new Set(['open', 'message', 'interrupt', 'kill', 'done', 'option', 'answer']);
 function causeOf(error) {
     return error instanceof Error ? error.message : String(error);
 }
@@ -71,13 +70,15 @@ function answeredWith(error) {
     return { failure: signedOut(error) ? 'signed_out' : 'error', cause: causeOf(error) };
 }
 function exitedWith(running, cause) {
-    return running.killed ? { failure: 'killed', cause: KILLED } : { failure: 'exited', cause };
+    if (running.killed)
+        return { failure: 'killed', cause: KILLED };
+    return { failure: running.adapter.silent() ? 'silent' : 'exited', cause };
 }
 function answerMessage(request, response) {
     return `The User answered a question you asked earlier.\nQuestion: ${JSON.stringify(request)}\nAnswer: ${JSON.stringify(response)}`;
 }
-async function sentPart(url, bytes) {
-    const answer = await fetch(relayed(url), { method: 'PUT', body: bytes });
+async function sentPart(url, bytes, headers) {
+    const answer = await fetch(relayed(url), { method: 'PUT', headers, body: bytes });
     await answer.arrayBuffer();
     if (!answer.ok)
         throw storeRefusal('upload', answer.status);
@@ -88,19 +89,29 @@ function logged(error) {
 function refusal(conversation, error) {
     if (conversation.kills > 0)
         return KILLED;
-    const cause = error instanceof NotStarted ? `${error.message}: ${causeOf(error.cause)}` : causeOf(error);
+    const cause = error instanceof Error && error.cause !== undefined ? `${error.message}: ${causeOf(error.cause)}` : causeOf(error);
     logged(new Error(`conversation ${conversation.id} did not start: ${cause}`));
     return causeOf(error);
 }
+function audioOf(result) {
+    if (result.isError === true)
+        return null;
+    const file = inspectedFile(result.content.map((content) => content.text).join('\n'));
+    return file?.media_type?.startsWith('audio/') === true ? file : null;
+}
 function marker(bridge) {
     return `HOUSE_BRIDGE=${bridge.env.HOUSE_BRIDGE}`;
 }
+function steers(adapter) {
+    return adapter.initialized._meta?.steering?.supported === true;
+}
 class Turn {
     id = randomUUID();
     parts;
     questions = 0;
     secrets = 0;
     prompted = false;
+    steered = false;
     taken = null;
     ended = false;
     images = 0;
@@ -120,17 +131,19 @@ class Conversation {
     context = null;
     leftovers = new Set();
     waiting = [];
+    done = false;
     sending = null;
     subagents = new Map();
     held = [];
     opening = null;
+    bridge = null;
     launch = null;
     prompted = null;
     kills = 0;
     killed = new AbortController();
     interrupts = 0;
     interrupted = new AbortController();
-    open = 0;
+    turns = new Set();
     queue = Promise.resolve();
     reports = Promise.resolve();
     starting = null;
@@ -186,7 +199,7 @@ 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.open > (asking ? 1 : 0))
+            if (conversation.turns.size > (asking ? 1 : 0))
                 return false;
         }
         const conversations = [...this.conversations.values()];
@@ -195,7 +208,7 @@ export class Conversations {
         return !conversations.some((conversation) => conversation.running?.scope.working() || [...conversation.leftovers].some((scope) => scope.working()));
     }
     quiet() {
-        return this.idle() && [...this.conversations.values()].every((conversation) => conversation.open === 0);
+        return this.idle() && [...this.conversations.values()].every((conversation) => conversation.turns.size === 0);
     }
     look() {
         for (const conversation of this.conversations.values()) {
@@ -211,8 +224,10 @@ export class Conversations {
     opened() {
         this.watched = false;
         for (const conversation of this.conversations.values()) {
-            if (conversation.running !== null)
+            if (conversation.running !== null) {
                 this.facts(conversation);
+                this.subagentsChanged(conversation);
+            }
             else if (conversation.exitUntold)
                 this.process(conversation, false);
             if (conversation.untold || conversation.told !== null)
@@ -239,9 +254,14 @@ export class Conversations {
     }
     async carry(conversation, call) {
         if (call.kind === 'open')
-            return { result: this.open(conversation, call) };
+            return this.open(conversation, call);
         if (call.kind === 'message')
             return this.message(conversation, call);
+        if (call.kind === 'done') {
+            conversation.done = true;
+            this.next(conversation);
+            return { result: Promise.resolve({}) };
+        }
         await this.launched(conversation);
         if (call.kind === 'interrupt') {
             if (--conversation.interrupts === 0)
@@ -260,17 +280,23 @@ export class Conversations {
             const question = this.questions.get(String(call.interaction_id));
             if (question === undefined) {
                 const text = answerMessage(call.request, call.response);
-                return this.message(conversation, { ...call, text, files: [], first: false });
+                return this.message(conversation, { ...call, text, first: false, message_id: null });
             }
             question.answer(call.response);
         }
         return { result: Promise.resolve({}) };
     }
-    open(conversation, call) {
-        if (conversation.running !== null)
-            return Promise.resolve({});
+    async open(conversation, call) {
+        await this.stop(conversation);
         const launch = conversation.launch ?? this.launch(conversation, this.route(conversation, call.agent_id), null, true);
-        return launch.session.then((session) => ({ provider_session_id: session }), (error) => ({ refused: refusal(conversation, error) }));
+        return {
+            result: launch.session.then((session) => ({ provider_session_id: session }), (error) => ({ refused: refusal(conversation, error) })),
+        };
+    }
+    async stop(conversation) {
+        const running = conversation.running;
+        running?.scope.kill();
+        await running?.adapter.exited;
     }
     launch(conversation, route, sessionId, empty) {
         let opened;
@@ -290,6 +316,7 @@ export class Conversations {
             if (conversation.launch !== launch)
                 return;
             conversation.launch = null;
+            this.closeIdleBridge(conversation);
             this.next(conversation);
         });
         this.next(conversation);
@@ -308,43 +335,92 @@ export class Conversations {
         return read;
     }
     async message(conversation, call) {
-        const content = [{ type: 'text', text: String(call.text) }];
+        const content = [
+            ...(typeof call.recent === 'string' ? [{ type: 'text', text: call.recent }] : []),
+            { type: 'text', text: String(call.text) },
+        ];
         let route;
         let instructing = null;
         try {
             route = await this.route(conversation, call.agent_id);
             if (call.first === true)
                 instructing = this.instructed(conversation, route);
-            const files = call.files;
-            if (files.length > 0)
-                this.prepares(conversation, 'files');
-            const paths = await placeFiles(this.kit.house, route.working_directory, files, conversation.killed.signal);
-            const lines = await this.transcribed(conversation, files, paths);
-            if (lines.length > 0)
-                content.push({ type: 'text', text: lines.join('\n') });
+            if (call.message_id !== null)
+                content.push(...(await this.transcribed(conversation, String(call.message_id), String(call.text))));
             if (conversation.kills > 0)
                 throw new Error(KILLED);
         }
         catch (error) {
+            this.closeIdleBridge(conversation);
             this.prepares(conversation, null);
             return { result: Promise.resolve({ refused: refusal(conversation, error) }) };
         }
         conversation.preparing = null;
-        return {
-            result: new Promise((settle) => {
-                conversation.waiting.push({ call, route, content, instructing, settle });
-                this.next(conversation);
-            }),
-        };
+        const { promise, resolve: settle } = Promise.withResolvers();
+        const waiting = { call, route, content, instructing, settle };
+        if (call.at_once === true && conversation.turns.size > 0)
+            await this.atOnce(conversation, waiting);
+        else
+            conversation.waiting.push(waiting);
+        this.next(conversation);
+        return { result: promise };
+    }
+    async atOnce(conversation, waiting) {
+        while (conversation.sending !== null)
+            await conversation.sending;
+        const running = conversation.running;
+        if (running !== null && conversation.turns.size > 0 && steers(running.adapter)) {
+            conversation.sending = this.steer(conversation, running, waiting);
+            await conversation.sending;
+            conversation.sending = null;
+            return;
+        }
+        this.ahead(conversation, waiting);
+        if (conversation.turns.size > 0)
+            await this.cancel(conversation);
+    }
+    ahead(conversation, waiting) {
+        const behind = conversation.waiting.findIndex((held) => held.call.at_once !== true);
+        conversation.waiting.splice(behind === -1 ? conversation.waiting.length : behind, 0, waiting);
+    }
+    async steer(conversation, running, waiting) {
+        let outcome;
+        try {
+            ({ outcome } = await running.adapter.connection.agent.request('_session/steering', {
+                sessionId: running.sessionId,
+                prompt: waiting.content,
+                _meta: { steering: { idleBehavior: 'promptRequired' } },
+            }));
+        }
+        catch (error) {
+            outcome = error;
+        }
+        if (outcome === 'promptRequired') {
+            this.ahead(conversation, waiting);
+        }
+        else if (outcome === 'injected' || outcome === 'startedNewTurn') {
+            if (outcome === 'injected') {
+                for (const turn of conversation.turns)
+                    turn.steered ||= turn.prompted;
+            }
+            this.kit.calls.keepResult(String(waiting.call.input_id), {});
+            waiting.settle({});
+        }
+        else {
+            const cause = outcome instanceof Error ? outcome : new Error(`the CLI answered ${JSON.stringify(outcome)}`);
+            waiting.settle({ refused: refusal(conversation, new NotStarted(UNSTEERED, { cause })) });
+        }
     }
     next(conversation) {
-        if (conversation.sending !== null || conversation.open > 0)
+        if (conversation.sending !== null || conversation.turns.size > 0)
             return;
         const waiting = conversation.waiting.shift();
         if (waiting === undefined) {
             const step = conversation.preparing ?? (conversation.launch === null ? null : 'session');
             if (conversation.starting !== step)
                 this.starts(conversation, step);
+            if (conversation.done && conversation.launch === null)
+                void this.stop(conversation).catch(logged);
             return;
         }
         conversation.sending = this.send(conversation, waiting).finally(() => {
@@ -387,7 +463,9 @@ export class Conversations {
                 conversation.session = null;
                 await this.kill(conversation);
             }
-            waiting.settle({ refused: refusal(conversation, error) });
+            const refused = refusal(conversation, error);
+            const resumeRefused = call.kind === 'message' && conversation.kills === 0 && error instanceof ResumeRefused;
+            waiting.settle(resumeRefused ? { refused, resume_refused: true } : { refused });
             return;
         }
         this.starts(conversation, null);
@@ -422,28 +500,72 @@ export class Conversations {
     retell(conversation) {
         conversation.untold = !this.kit.send({ type: 'starting', conversation_id: conversation.id, step: conversation.told });
     }
-    async transcribed(conversation, files, paths) {
-        const lines = [];
-        for (const [index, path] of paths.entries()) {
-            lines.push(path);
-            if (files[index].media_type?.startsWith('audio/') !== true)
-                continue;
-            this.prepares(conversation, 'transcription');
-            try {
-                const text = await transcribe(path, AbortSignal.any([conversation.killed.signal, conversation.interrupted.signal]));
-                if (text !== null && text !== '')
-                    lines.push(`Transcript: ${text}`);
-            }
-            catch (error) {
-                if (conversation.kills > 0)
-                    throw error;
-                logged(new Error(`${files[index].name} was not transcribed: ${causeOf(error)}`));
+    async transcribed(conversation, messageId, text) {
+        const paths = linkedPaths(text);
+        if (paths.length === 0)
+            return [];
+        const killed = conversation.killed.signal;
+        const interrupted = conversation.interrupted.signal;
+        const transcribing = AbortSignal.any([killed, interrupted]);
+        let signal = killed;
+        const blocks = [];
+        try {
+            const bridge = await step(unbridged, unlessAborted(this.bridged(conversation), killed));
+            const read = async (path) => audioOf(await step(unbridged, unlessAborted(bridge.tool('inspect', { path }), signal)));
+            for (const path of paths) {
+                let answered = await read(path);
+                if (answered === null)
+                    continue;
+                signal = transcribing;
+                this.prepares(conversation, 'transcription');
+                const said = await transcribe(async () => {
+                    const address = answered ?? (await read(path));
+                    answered = null;
+                    if (address === null)
+                        throw new Error(`${path} is no longer an audio file`);
+                    return address;
+                }, signal);
+                const transcript = `/kit/conversations/${conversation.id}/messages/${messageId}/transcripts`;
+                await step(unbridged, unlessAborted(this.kit.house.deliver(transcript, { path, text: said }, () => !signal.aborted), signal));
+                blocks.push({ type: 'text', text: `${path}\nTranscript: ${said}` });
             }
         }
-        return lines;
+        catch (error) {
+            if (signal === transcribing && interrupted.aborted && conversation.kills === 0)
+                throw new NotStarted(INTERRUPTED, { cause: error });
+            throw error;
+        }
+        return blocks;
+    }
+    bridged(conversation) {
+        if (conversation.bridge === null) {
+            const bridging = openBridge(this.kit.house, this.kit.copies, conversation.id, conversation.killed.signal);
+            conversation.bridge = bridging;
+            bridging.catch(() => {
+                if (conversation.bridge === bridging)
+                    conversation.bridge = null;
+            });
+        }
+        return conversation.bridge;
+    }
+    closeBridge(conversation, bridging, bridge) {
+        bridge.close();
+        if (conversation.bridge === bridging)
+            conversation.bridge = null;
+    }
+    closeIdleBridge(conversation) {
+        const bridging = conversation.bridge;
+        if (bridging === null || conversation.running !== null || conversation.launch !== null)
+            return;
+        conversation.bridge = null;
+        void bridging.then((bridge) => bridge.close(), () => undefined);
     }
     async interrupt(conversation, turnId) {
-        if (conversation.running === null || conversation.turn?.id !== turnId)
+        if ([...conversation.turns].some((turn) => turn.id === turnId))
+            await this.cancel(conversation);
+    }
+    async cancel(conversation) {
+        if (conversation.running === null)
             return;
         await conversation.running.adapter.connection.agent.notify('session/cancel', {
             sessionId: conversation.running.sessionId,
@@ -504,9 +626,10 @@ 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(unbridged, openBridge(this.kit.house, this.kit.copies, conversation.id, conversation.killed.signal));
+        const bridging = this.bridged(conversation);
+        const bridge = await step(unbridged, bridging);
         if (conversation.kills > 0) {
-            bridge.close();
+            this.closeBridge(conversation, bridging, bridge);
             throw new Error(KILLED);
         }
         conversation.opening = bridge;
@@ -514,7 +637,6 @@ export class Conversations {
         const scope = new Scope(marker(bridge), randomUUID(), cli);
         let adapter = null;
         try {
-            await unlessAborted(createHowWeWork(bridge), conversation.killed.signal);
             bridged(bridge);
             await CLIS[route.kind].allowHouse(bridge.env.PATH);
             const streamed = await step(NO_CONNECTION, work.open(cli));
@@ -522,7 +644,7 @@ export class Conversations {
                 work.read(message);
                 this.read(conversation, reader, message);
             }, { ...bridge.env, ...streamed }, undefined, scope));
-            void adapter.exited.then(() => bridge.close());
+            void adapter.exited.then(() => this.closeBridge(conversation, bridging, bridge));
             const agent = adapter.connection.agent;
             const cwd = route.working_directory;
             const _meta = CLIS[route.kind].sessionMeta(bridge.env.HOUSE_BRIDGE, conversation.id);
@@ -533,10 +655,11 @@ export class Conversations {
                 const prompt = [{ type: 'text', text: `/rename ${conversation.id}` }];
                 await step(unopened(NO_SESSION), agent.request('session/prompt', { sessionId: opened.sessionId, prompt }));
             }
-            const running = { adapter, bridge, sessionId: opened.sessionId, killed: false, reader, work, scope };
+            const running = { adapter, bridging, bridge, sessionId: opened.sessionId, killed: false, reader, work, scope };
             const options = await step(NO_SETTINGS, this.launchSettings(running, route, opened.configOptions ?? []));
             void work.settled().then(() => scope.record());
             conversation.running = running;
+            adapter.turn(conversation.turns.size > 0);
             conversation.session = running.sessionId;
             conversation.options = options;
             this.facts(conversation);
@@ -547,7 +670,7 @@ export class Conversations {
             adapter?.retire();
             work.close();
             conversation.leftovers.add(scope);
-            bridge.close();
+            this.closeBridge(conversation, bridging, bridge);
             throw conversation.kills > 0 ? new Error(KILLED) : error;
         }
         finally {
@@ -560,7 +683,7 @@ export class Conversations {
         }
         catch (error) {
             if (!empty || conversation.kills > 0 || !CLIS[kind].unknownSession(error)) {
-                throw new NotStarted(unopened(NO_RESUME)(error), { cause: error });
+                throw signedOut(error) ? new NotStarted(NOT_SIGNED_IN, { cause: error }) : new ResumeRefused(NO_RESUME, { cause: error });
             }
             logged(new Error(`conversation ${conversation.id} opens a new session: ${NO_RESUME}: ${causeOf(error)}`));
             return null;
@@ -596,11 +719,17 @@ export class Conversations {
         this.kit.changed();
     }
     detach(conversation, running) {
+        if (conversation.bridge === running.bridging)
+            conversation.bridge = null;
         running.work.close();
         conversation.leftovers.add(running.scope);
         conversation.running = null;
         conversation.commands = null;
         conversation.options = null;
+        if (conversation.subagents.size > 0) {
+            conversation.subagents.clear();
+            this.subagentsChanged(conversation);
+        }
         for (const [id, question] of this.questions) {
             if (question.conversation === conversation)
                 this.questions.delete(id);
@@ -617,6 +746,10 @@ export class Conversations {
         if (conversation.options !== null)
             this.options(conversation, conversation.options);
     }
+    subagentsChanged(conversation) {
+        const subagents = [...conversation.subagents.values()].map(({ description, activity }) => ({ description, activity }));
+        this.kit.send({ type: 'subagents', conversation_id: conversation.id, subagents });
+    }
     commands(conversation, commands) {
         conversation.commands = commands;
         if (conversation.running === null)
@@ -651,7 +784,8 @@ export class Conversations {
     }
     begin(conversation) {
         const turn = new Turn((operation) => this.write(conversation, turn, operation));
-        conversation.open++;
+        conversation.turns.add(turn);
+        conversation.running?.adapter.turn(true);
         void this.deliver(conversation, turn, 'started', {}).catch(logged);
         conversation.turn = turn;
         if (conversation.context !== null)
@@ -673,7 +807,8 @@ export class Conversations {
         if (notice !== null)
             turn.parts.start({ type: 'marker', marker: 'retry', text: notice });
         turn.ended = true;
-        conversation.open--;
+        conversation.turns.delete(turn);
+        conversation.running?.adapter.turn(conversation.turns.size > 0);
         if (conversation.turn === turn)
             conversation.turn = null;
         const body = Promise.allSettled(turn.uploads).then(() => ({
@@ -706,7 +841,7 @@ export class Conversations {
             }
             else {
                 this.took(turn);
-                if (conversation.open === 1 && conversation.running === running) {
+                if (conversation.turns.size === 1 && conversation.turns.has(turn) && conversation.running === running) {
                     running.adapter.retire();
                     this.detach(conversation, running);
                 }
@@ -719,19 +854,22 @@ export class Conversations {
         this.took(turn);
         return turn;
     }
-    ended(conversation) {
+    ended(conversation, stop) {
         const turn = conversation.turn;
         if (turn === null)
             return;
-        if (!turn.prompted) {
-            this.end(conversation, turn, null);
-        }
-        else {
-            for (const event of conversation.running?.reader.closeTurn() ?? [])
-                this.apply(conversation, turn, event);
-            conversation.turn = null;
-            this.kit.changed();
+        const held = stop !== null && !turn.steered && [...conversation.subagents.values()].some((subagent) => subagent.turn === turn);
+        if (!turn.prompted || held) {
+            this.took(turn);
+            this.end(conversation, turn, stop === 'refusal' ? { failure: 'refused', cause: REFUSED } : null);
+            return;
         }
+        if (stop !== null)
+            return;
+        for (const event of conversation.running?.reader.closeTurn() ?? [])
+            this.apply(conversation, turn, event);
+        conversation.turn = null;
+        this.kit.changed();
     }
     async ask(conversation, method, params, secret, signal) {
         const turn = this.started(conversation);
@@ -787,7 +925,7 @@ export class Conversations {
                 this.started(conversation);
                 return;
             case 'ended':
-                this.ended(conversation);
+                this.ended(conversation, event.stop);
                 return;
             case 'commands':
                 this.commands(conversation, event.commands);
@@ -802,6 +940,9 @@ export class Conversations {
             case 'subagent-done':
                 this.subagentDone(conversation, event.id, event.result);
                 return;
+            case 'subagent-activity':
+                this.subagentActivity(conversation, event.id, event.activity);
+                return;
             case 'marker':
             case 'image':
                 if (conversation.turn !== null)
@@ -828,7 +969,8 @@ export class Conversations {
                 return;
             case 'subagent': {
                 const index = turn.parts.start({ type: 'subagent', description: event.description, status: 'running', result: null });
-                conversation.subagents.set(event.id, { description: event.description, turn, index });
+                conversation.subagents.set(event.id, { description: event.description, turn, index, activity: null });
+                this.subagentsChanged(conversation);
                 return;
             }
             case 'message':
@@ -851,6 +993,7 @@ export class Conversations {
         if (subagent === undefined)
             return;
         conversation.subagents.delete(id);
+        this.subagentsChanged(conversation);
         if (subagent.turn === conversation.turn) {
             subagent.turn.parts.done(subagent.index, result);
             return;
@@ -861,20 +1004,31 @@ export class Conversations {
         else
             conversation.turn.parts.start(part);
     }
+    subagentActivity(conversation, id, activity) {
+        const subagent = conversation.subagents.get(id);
+        if (subagent === undefined || subagent.activity === activity)
+            return;
+        subagent.activity = activity;
+        this.subagentsChanged(conversation);
+    }
     async image(conversation, turn, reserved, data, mediaType) {
         const bytes = Buffer.from(data, 'base64');
         const name = `image-${++turn.images}.${mediaType.split('/')[1]}`;
+        const sha256 = createHash('sha256').update(bytes).digest('hex');
         try {
             const declared = (await this.deliver(conversation, turn, 'images', {
                 name,
                 media_type: mediaType,
                 bytes: bytes.length,
-                sha256: createHash('sha256').update(bytes).digest('hex'),
+                sha256,
             }));
             const saved = await uploaded(declared.upload, {
+                name,
                 bytes: bytes.length,
-                send: (url, start, end) => sentPart(url, bytes.subarray(start, end)),
-                finish: (upload) => this.kit.house.deliver('/kit/uploads/finish', { upload }),
+                sha256,
+                read: (start, end) => [bytes.subarray(start, end)],
+                send: (url, start, end, headers) => sentPart(url, bytes.subarray(start, end), headers),
+                finish: (upload, partSha256) => this.kit.house.deliver('/kit/uploads/finish', { upload, part_sha256: partSha256 }),
             });
             turn.parts.arrive({ type: 'image', file: saved.path, name, media_type: mediaType }, reserved);
         }

package/dist/end.js

@@ -14,9 +14,15 @@ export function end(reason) {
 export function restart(reason) {
     exit(reason, 1);
 }
-export function updateRequired() {
+function updateLine(lead) {
     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}`);
+    return command === null ? `${lead}; install it again.` : `${lead}. Update it: ${command}`;
+}
+export function updateRequired() {
+    end(updateLine('This Kit is too old for House'));
+}
+export function unknownMethod(kind) {
+    return updateLine(`This Kit does not know ${kind}`);
 }
 export function newerThanHouse(release, command) {
     end(`Kit ${KIT_RELEASE} is newer than this Building supports (Kit ${release}). Install Kit ${release}: ${command}`);