@agentshouse/kit 0.2.1-ce3d2bb67177c → 0.2.1-ce47f621f90e1

package/dist/connection.js

@@ -3,40 +3,13 @@ import { HouseRefusal, retryDelay } from './api.js';
 import { end, REPLACED, signInAgain } from './end.js';
 import { readEnrolment } from './home.js';
 import { relayed } from './relay.js';
-import { endUnserved, KIT_WIRE } from './wire.js';
+import { Silence } from './silence.js';
+import { endUnserved, KIT_WIRE, unserved } from './wire.js';
 const PATH = '/kit/stream';
 const SUBPROTOCOL = `house.kit.stream.${KIT_WIRE}`;
 const REFUSAL_HEADER = 'x-house-refusal';
 // House beats each Kit connection every thirty seconds, so two silent beats mean this Kit process cannot hear House.
 export const CONNECTION_SILENCE_MS = 60_000;
-const SYSTEM_CONNECTION_CLOCK = {
-    later: (delay, callback) => setTimeout(callback, delay),
-    clear: (timer) => clearTimeout(timer),
-};
-export class ConnectionSilence {
-    timer = null;
-    silent;
-    clock;
-    interval;
-    constructor(silent, clock = SYSTEM_CONNECTION_CLOCK, interval = CONNECTION_SILENCE_MS) {
-        this.silent = silent;
-        this.clock = clock;
-        this.interval = interval;
-    }
-    heard() {
-        this.stop();
-        this.timer = this.clock.later(this.interval, () => {
-            this.timer = null;
-            this.silent();
-        });
-    }
-    stop() {
-        if (this.timer === null)
-            return;
-        this.clock.clear(this.timer);
-        this.timer = null;
-    }
-}
 function connectionUrl(house) {
     const url = new URL(PATH, house);
     url.protocol = url.protocol === 'https:' ? 'wss:' : 'ws:';
@@ -58,21 +31,28 @@ subscribe('undici:request:headers', (message) => {
 });
 export function holdConnection(handlers) {
     let connection = null;
+    let socket = null;
     let failures = 0;
     const connect = async () => {
         const { house, credential } = (await readEnrolment());
+        if (socket !== null || unserved())
+            return;
         refused = null;
         const opening = new WebSocket(relayed(connectionUrl(house)), {
             protocols: [SUBPROTOCOL],
             headers: { authorization: `Bearer ${credential}` },
         });
+        socket = opening;
         let opened = false;
         let silence = null;
         const closed = (event) => {
             silence?.stop();
             silence = null;
+            if (socket === opening)
+                socket = null;
             if (connection === opening)
                 connection = null;
+            handlers.closed();
             process.stderr.write(`kit: connection closed ${event.code} ${event.reason}\n`);
             if (event.reason === 'replaced')
                 end(REPLACED);
@@ -91,7 +71,7 @@ export function holdConnection(handlers) {
             opened = true;
             failures = 0;
             connection = opening;
-            silence = new ConnectionSilence(() => {
+            silence = new Silence(CONNECTION_SILENCE_MS, () => {
                 if (connection !== opening)
                     return;
                 connection = null;

package/dist/conversations.js

@@ -1,9 +1,9 @@
-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';
@@ -16,10 +16,8 @@ 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';
@@ -35,6 +33,7 @@ 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 {
@@ -47,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);
 }
@@ -66,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);
 }
@@ -74,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);
@@ -104,12 +102,16 @@ function audioOf(result) {
 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;
@@ -129,6 +131,7 @@ class Conversation {
     context = null;
     leftovers = new Set();
     waiting = [];
+    done = false;
     sending = null;
     subagents = new Map();
     held = [];
@@ -140,7 +143,7 @@ class Conversation {
     killed = new AbortController();
     interrupts = 0;
     interrupted = new AbortController();
-    open = 0;
+    turns = new Set();
     queue = Promise.resolve();
     reports = Promise.resolve();
     starting = null;
@@ -196,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()];
@@ -205,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()) {
@@ -221,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)
@@ -249,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)
@@ -276,11 +286,17 @@ export class Conversations {
         }
         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;
@@ -319,7 +335,10 @@ 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 {
@@ -337,21 +356,71 @@ export class Conversations {
             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(() => {
@@ -492,7 +561,11 @@ export class Conversations {
         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,
@@ -564,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));
@@ -587,6 +659,7 @@ export class Conversations {
             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);
@@ -653,6 +726,10 @@ export class Conversations {
         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);
@@ -669,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)
@@ -703,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)
@@ -725,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(() => ({
@@ -758,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);
                 }
@@ -771,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);
@@ -839,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);
@@ -854,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)
@@ -880,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':
@@ -903,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;
@@ -913,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() {
+export 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}`);

package/dist/events.js

@@ -1,8 +1,13 @@
+const AUTONOMOUS_ORIGINS = new Set(['task-notification', 'peer', 'coordinator', 'observer', 'observer-activity']);
 const COMMAND = { shown: 'command' };
 const HIDDEN = { shown: 'hidden' };
 const FINISHED = new Set(['completed', 'failed']);
 export const RUNNING_JOB = new Set(['running', 'paused']);
-const MESSAGE_TARGETS = { send_routine_request: 'access', cancel_routine_request: 'request', send_mail: 'request' };
+const MESSAGE_TARGETS = new Map([
+    ['send_agent_function_request', ['agent_function', 'agent']],
+    ['cancel_agent_function_request', ['request']],
+    ['send_mail', ['conversation', 'request']],
+]);
 function words(line) {
     const found = [];
     let word = null;
@@ -48,11 +53,13 @@ export function houseMessage(line) {
     catch {
         return null;
     }
-    const argument = MESSAGE_TARGETS[call.command];
-    if (argument === undefined)
+    if (call === null)
         return null;
-    const target = call.arguments?.[argument];
-    return { shown: 'message', command: call.command, target: typeof target === 'string' ? target : null };
+    const targets = MESSAGE_TARGETS.get(call.command);
+    if (targets === undefined)
+        return null;
+    const target = targets.map((argument) => call.arguments?.[argument]).find((value) => typeof value === 'string');
+    return { shown: 'message', command: call.command, target: target ?? null };
 }
 function decidedByLine(command, final) {
     const line = typeof command === 'string' ? command : Array.isArray(command) ? command.at(-1) : undefined;
@@ -269,6 +276,7 @@ class Reader {
 class ClaudeReader extends Reader {
     watchedOptions = { model: 'model' };
     tasks = new Map();
+    stop = null;
     own(message) {
         if (message.params?.update?._meta?.claudeCode?.parentToolUseId !== undefined)
             return [];
@@ -276,7 +284,9 @@ class ClaudeReader extends Reader {
     }
     update(update) {
         if (update.sessionUpdate === 'usage_update' && update._meta?.['_claude/origin'] !== undefined) {
-            return [...super.update(update), { kind: 'ended' }];
+            const stop = this.stop;
+            this.stop = null;
+            return [...super.update(update), { kind: 'ended', stop }];
         }
         if (update.sessionUpdate === 'session_info_update' && update._meta?.jetbrains?.air?.sessionFailure !== undefined) {
             return [{ kind: 'marker', marker: 'retry', text: update._meta.jetbrains.air.sessionFailure.title }];
@@ -287,6 +297,13 @@ class ClaudeReader extends Reader {
         if (message.method !== '_claude/sdkMessage')
             return [];
         const sdk = message.params.message;
+        if (sdk.type === 'result') {
+            if (AUTONOMOUS_ORIGINS.has(sdk.origin?.kind))
+                this.stop = null;
+            else
+                this.stop = sdk.stop_reason === 'refusal' ? 'refusal' : sdk.is_error === true ? null : 'end_turn';
+            return [];
+        }
         switch (sdk.subtype) {
             case 'task_started':
                 if (sdk.tool_use_id !== undefined)
@@ -294,6 +311,10 @@ class ClaudeReader extends Reader {
                 return [];
             case 'task_notification':
                 return sdk.tool_use_id === undefined ? [] : this.finish(sdk.tool_use_id, sdk.summary ?? null);
+            case 'task_progress':
+                if (!this.subagents.has(sdk.tool_use_id) || this.done.has(sdk.tool_use_id) || typeof sdk.description !== 'string')
+                    return [];
+                return [{ kind: 'subagent-activity', id: sdk.tool_use_id, activity: sdk.description }];
             default:
                 return [];
         }
@@ -356,7 +377,7 @@ class CodexReader extends Reader {
                 if (codex?.threadStatus?.type === 'active')
                     return [{ kind: 'started' }];
                 if (codex?.threadStatus?.type === 'idle')
-                    return [{ kind: 'ended' }];
+                    return [{ kind: 'ended', stop: null }];
                 if (codex?.error !== undefined)
                     return [{ kind: 'marker', marker: 'retry', text: codex.error.message ?? '' }];
                 return [];
@@ -429,7 +450,7 @@ class GrokReader extends Reader {
             return (message.params.runningPromptId ?? null) !== null && session === this.session ? [{ kind: 'started' }] : [];
         }
         if (message.params?.update?.sessionUpdate === 'turn_completed') {
-            return session === this.session ? [{ kind: 'ended' }] : [];
+            return session === this.session ? [{ kind: 'ended', stop: null }] : [];
         }
         if (message.method === '_x.ai/models/update') {
             this.offered(message.params);