@agentshouse/kit 0.2.1-alpha.1 → 0.2.1-alpha.11

package/dist/conversations.js

@@ -9,11 +9,15 @@ import { CLIS } from './clis.js';
 import { placeFiles } from './files.js';
 import { instructions } from './instructions.js';
 import { holdSecretInput } from './secret-input.js';
+import { createHowWeWork } from './skills.js';
 const LAUNCH_BASE = '/agents/house';
 const KILLED = 'the conversation was killed';
 function causeOf(error) {
     return error instanceof Error ? error.message : String(error);
 }
+function answerMessage(request, response) {
+    return `The User answered a question you asked earlier.\nQuestion: ${JSON.stringify(request)}\nAnswer: ${JSON.stringify(response)}`;
+}
 function logged(error) {
     process.stderr.write(`kit: ${causeOf(error)}\n`);
 }
@@ -32,15 +36,18 @@ function stop(bridge) {
 class Turn {
     id = randomUUID();
     text = '';
+    segment = null;
+    admitted = false;
+    notes = [];
     sent = [];
     unsentFrom = null;
     draftSequence = 0;
     planSequence = 0;
+    entries = null;
     questions = 0;
     secrets = 0;
     prompt = null;
     ended = false;
-    ready = Promise.resolve();
 }
 class Conversation {
     id;
@@ -140,8 +147,13 @@ export class Conversations {
         }
         if (input.kind === 'option')
             await this.option(conversation, String(input.option), input.value);
-        if (input.kind === 'answer')
-            this.questions.get(String(input.interaction_id))?.answer(input.response);
+        if (input.kind === 'answer') {
+            const question = this.questions.get(String(input.interaction_id));
+            if (question === undefined) {
+                return this.message(conversation, { ...input, text: answerMessage(input.request, input.response), files: [], first: false });
+            }
+            question.answer(input.response);
+        }
         return {};
     }
     async open(conversation, input) {
@@ -166,7 +178,10 @@ export class Conversations {
                     ack = { provider_session_id: opened };
             }
             if (input.first === true) {
-                prompt.push({ type: 'text', text: await instructions(conversation.running.bridge, route.base_instructions) });
+                prompt.push({
+                    type: 'text',
+                    text: await instructions(conversation.running.bridge, route.base_instructions, await this.kit.copies.mapping()),
+                });
             }
             prompt.push({ type: 'text', text: String(input.text) });
             if (paths.length > 0)
@@ -239,14 +254,15 @@ export class Conversations {
             .onRequest('session/request_permission', ({ params, signal }) => this.ask(conversation, 'session/request_permission', params, false, signal))
             .onRequest('elicitation/create', ({ params, signal }) => this.ask(conversation, 'elicitation/create', params, asksSecret(params), signal));
         await unlessKilled(this.kit.agents.installed(), conversation.killed.signal);
-        const bridge = await openBridge(this.kit.house, conversation.id, conversation.killed.signal);
+        const bridge = await openBridge(this.kit.house, this.kit.copies, conversation.id, conversation.killed.signal);
         if (conversation.kills > 0) {
             bridge.close();
             throw new Error(KILLED);
         }
         conversation.opening = bridge;
         try {
-            const adapter = await startAdapter(route.kind, route.working_directory, app, (job) => this.job(conversation, job), { ...process.env, ...bridge.env });
+            await unlessKilled(createHowWeWork(bridge), conversation.killed.signal);
+            const adapter = await startAdapter(route.kind, route.working_directory, app, (job) => this.job(conversation, job), bridge.env);
             void adapter.exited.then(() => bridge.close());
             const agent = adapter.connection.agent;
             const cwd = route.working_directory;
@@ -259,6 +275,7 @@ export class Conversations {
                 sessionId: opened.sessionId,
                 killed: false,
                 queues: CLIS[route.kind].queues,
+                phase: CLIS[route.kind].phase,
             };
             const options = await this.launchSettings(running, route, opened.configOptions ?? []);
             conversation.running = running;
@@ -340,15 +357,39 @@ export class Conversations {
     report(conversation) {
         const turn = new Turn();
         conversation.open++;
-        turn.ready = this.deliver(conversation, turn, 'started', {}).then(() => undefined, logged);
+        void this.deliver(conversation, turn, 'started', {})
+            .then(() => this.admitted(conversation, turn))
+            .catch(logged);
         return turn;
     }
+    admitted(conversation, turn) {
+        turn.admitted = true;
+        for (const note of turn.notes.splice(0))
+            this.kit.send(note);
+        if (turn.text !== '') {
+            turn.unsentFrom = 0;
+            this.draft(conversation, turn);
+        }
+        if (turn.entries !== null)
+            this.plan(conversation, turn);
+    }
     begin(conversation) {
         const turn = this.report(conversation);
         conversation.turn = turn;
         this.kit.changed();
         return turn;
     }
+    finish(conversation, turn) {
+        if (turn.ended)
+            return;
+        const segment = turn.segment;
+        turn.segment = null;
+        if (segment?.phase === 'note')
+            this.note(conversation, turn, segment.text);
+        else if (segment !== null)
+            this.answer(conversation, turn, segment.text);
+        this.end(conversation, turn, { text: turn.text });
+    }
     end(conversation, turn, outcome) {
         if (turn.ended)
             return;
@@ -406,7 +447,7 @@ export class Conversations {
                 this.end(conversation, turn, { failed });
         }
         else if (turn.prompt === sent) {
-            this.end(conversation, turn, { text: turn.text });
+            this.finish(conversation, turn);
         }
     }
     started(conversation) {
@@ -423,7 +464,7 @@ export class Conversations {
         if (turn === null)
             return;
         if (turn.prompt === null) {
-            this.end(conversation, turn, { text: turn.text });
+            this.finish(conversation, turn);
         }
         else {
             conversation.turn = null;
@@ -477,17 +518,21 @@ export class Conversations {
     update(conversation, notification) {
         const update = notification.update;
         if (update.sessionUpdate === 'agent_message_chunk' && update.content.type === 'text') {
-            const turn = this.started(conversation);
-            turn.text += update.content.text;
-            const text = turn.text;
-            void turn.ready.then(() => this.draft(conversation, turn, text));
+            this.chunk(conversation, this.started(conversation), update, update.content.text);
         }
         else if (update.sessionUpdate === 'plan') {
             const turn = this.started(conversation);
-            void turn.ready.then(() => this.plan(conversation, turn, update.entries));
+            this.close(conversation, turn);
+            turn.entries = update.entries;
+            this.plan(conversation, turn);
+        }
+        else if (update.sessionUpdate === 'tool_call') {
+            this.close(conversation, this.started(conversation));
         }
-        else if (update.sessionUpdate === 'agent_thought_chunk' || update.sessionUpdate === 'tool_call') {
-            this.started(conversation);
+        else if (update.sessionUpdate === 'agent_thought_chunk') {
+            const turn = this.started(conversation);
+            if (turn.segment?.messageId !== (update.messageId ?? null))
+                this.close(conversation, turn);
         }
         else if (update.sessionUpdate === 'available_commands_update') {
             this.commands(conversation, update.availableCommands);
@@ -503,8 +548,40 @@ export class Conversations {
             conversation.jobs.delete(job.id);
         this.kit.changed();
     }
-    draft(conversation, turn, text) {
-        const blocks = blocksOf(text);
+    chunk(conversation, turn, chunk, text) {
+        const phase = conversation.running?.phase(chunk) ?? null;
+        const messageId = chunk.messageId ?? null;
+        if (turn.segment?.messageId !== messageId || turn.segment.phase !== phase)
+            this.close(conversation, turn);
+        if (phase === 'answer') {
+            this.answer(conversation, turn, text);
+            return;
+        }
+        turn.segment ??= { messageId, phase, text: '' };
+        turn.segment.text += text;
+    }
+    close(conversation, turn) {
+        const segment = turn.segment;
+        if (segment === null)
+            return;
+        turn.segment = null;
+        this.note(conversation, turn, segment.text);
+    }
+    note(conversation, turn, text) {
+        if (text.trim() === '')
+            return;
+        const note = { type: 'working-note', conversation_id: conversation.id, note_id: randomUUID(), text };
+        if (turn.admitted)
+            this.kit.send(note);
+        else
+            turn.notes.push(note);
+    }
+    answer(conversation, turn, text) {
+        turn.text += text;
+        this.draft(conversation, turn);
+    }
+    draft(conversation, turn) {
+        const blocks = blocksOf(turn.text);
         const from = Math.min(firstChange(turn.sent, blocks), turn.unsentFrom ?? Infinity);
         const sent = this.kit.send({
             type: 'draft',
@@ -523,14 +600,14 @@ export class Conversations {
             turn.unsentFrom = from;
         }
     }
-    plan(conversation, turn, entries) {
+    plan(conversation, turn) {
         const sent = this.kit.send({
             type: 'plan',
             conversation_id: conversation.id,
             turn_id: turn.id,
             sequence: turn.planSequence + 1,
             from: 0,
-            steps: entries.map((entry) => ({ label: entry.content, priority: entry.priority, status: entry.status })),
+            steps: turn.entries.map((entry) => ({ label: entry.content, priority: entry.priority, status: entry.status })),
         });
         if (sent)
             turn.planSequence++;