@agentshouse/kit 0.1.0-alpha.28 → 0.1.0-alpha.29

package/src/worker.js

@@ -15,13 +15,13 @@ import { bridgedFrame, openBridge } from "./bridge.js";
 import { transferBytes } from "./bytes.js";
 import { assistantBlocks } from "./blocks.js";
 import { retryConversationFiles } from "./conversation-originals.js";
-import { openAssistantDrafts } from "./draft.js";
 import { localRequest, reconcileInbound } from "./inbound.js";
 import { localFiles } from "./local-files.js";
 import { answerText, answerYaml, editRefusal } from "./mcp.js";
 import { inheritedEnvironment } from "./command.js";
 import { sourceEntries } from "./google/entries.js";
 import { watchKitWork } from "./kit-work-stream.js";
+import { finalPlan } from "./plan.js";
 import { coalescedTask, residentWake } from "./tasks.js";
 import {
   applyWorkingCopies,
@@ -56,7 +56,6 @@ import {
   acquireOneRun,
   acquireOneResumption,
   admitInteraction,
-  admitPlanSnapshot,
   awaitSecretInput,
   rejectResumption,
   callHouseMcp,
@@ -78,7 +77,6 @@ import {
   reportSessions,
   serveResident,
   sessionAuthority,
-  streamAssistantDraft,
   updateDrain,
 } from "./house.js";
 import { operationId } from "./operation.js";
@@ -87,6 +85,7 @@ import { readSettlements, removeSettlement, writeSettlement } from "./settlement
 import { howWeWorkOwed, noteHowWeWork, reconcileSkillSet } from "./skill-set.js";
 import { writeText } from "./state.js";
 import { failedReport, terminalReport } from "./terminal.js";
+import { kitStreamWriter, turnFrames } from "./turn-frames.js";
 import {
   createSession,
   destroySession,
@@ -102,7 +101,7 @@ const PASS_REACHES = ["commands", "runs"];
 
 async function dispatchSeal(context, bound) {
   try {
-    await acceptAssistantText(context.session, bound.session, bound.sealed);
+    await acceptAssistantText(context.session, bound.session, bound.sealed, bound.plan);
     bound.stopped.textAccepted = true;
   } catch (refusal) {
     if (!(refusal instanceof KitRefusal)) throw refusal;
@@ -217,7 +216,7 @@ async function completeOwnerStop(context, bound, requestedAt) {
   const destroyed = await destroySession(context.runtime, bound.tmux);
   let failure = null;
   try {
-    await observeSessionStop(context.session, bound.session);
+    await observeSessionStop(context.session, bound.session, false, bound.plan);
   } catch (refusal) {
     if (undecided(context, refusal)) return { destroyed, confirmed: false, failure: null };
     if (!(refusal instanceof KitRefusal)) throw refusal;
@@ -230,7 +229,7 @@ async function completeOwnerStop(context, bound, requestedAt) {
 
 async function settleReported(context, bound) {
   try {
-    await reportRunOutcome(context.session, bound.run, bound.reported);
+    await reportRunOutcome(context.session, bound.run, bound.reported, bound.plan);
     return { settled: true, failure: null };
   } catch (refusal) {
     if (undecided(context, refusal)) return { settled: false, failure: null };
@@ -359,25 +358,23 @@ async function sessionPush(context, bound, authority, frame, signal) {
 async function openRunBridge(context, bound, authority, start) {
   const ended = new AbortController();
   const handed = (act) => endOnEpochReport(ended, act);
-  const drafts = openAssistantDrafts({
-    send: handed((blocks) => streamAssistantDraft(context.session, bound.session, blocks)),
-  });
+  const frames = turnFrames(context.stream);
   const bridge = await openBridge({
     socket: bound.socket,
     nonce: bound.nonce,
     signal: AbortSignal.any([context.signal, ended.signal]),
     mutates: mutatingCall(await toolMutations(context.session, context.signal)),
     alive: () => sessionPresent(context.runtime, bound.tmux),
-    draft: (text) => drafts.update(text),
+    draft: (view) => frames.draft(view),
+    plan: (snapshot) => frames.plan(snapshot),
     start,
     question: handed((batch) => admitInteraction(context.session, bound.session, batch)),
-    plan: handed((snapshot) => admitPlanSnapshot(context.session, bound.session, snapshot)),
     howWeWork: () =>
       noteHowWeWork(context.directory).catch((error) =>
         reported(`How-we-work note unwritable (${error.code ?? "unknown"})`),
       ),
-    interrupt: handed((interrupt, outcome) =>
-      reportInterruptOutcome(context.session, interrupt, outcome),
+    interrupt: handed((interrupt, outcome, plan) =>
+      reportInterruptOutcome(context.session, interrupt, outcome, finalPlan(plan)),
     ),
     secret: (interaction, ceremony) => awaitSecretInput(context.session, interaction, ceremony),
     settle: handed((interaction, outcome) => settleInteraction(context, interaction, outcome)),
@@ -393,11 +390,11 @@ async function openRunBridge(context, bound, authority, start) {
           signal,
         ), context.session.dependencies, signal)(frame)),
   });
-  return { bridge, drafts, ended };
+  return { bridge, frames, ended };
 }
 
 async function superviseBound(context, bound, opened, start) {
-  const { bridge, drafts, ended } = opened;
+  const { bridge, ended } = opened;
   const spawn = { committed: false };
   let unsupervised = null;
   let destroyed = false;
@@ -411,24 +408,20 @@ async function superviseBound(context, bound, opened, start) {
     unsupervised = { code: refusal.code, detail: refusal.message };
   } finally {
     try {
-      try {
-        retryFiles(context);
-        await settleFiles(context);
-        for (const interaction of bridge.unsettledInteractions()) {
-          await settleInteraction(context, interaction, "expired");
-        }
-      } finally {
-        bridge.stopRecovery();
-        if (owner === null) {
-          try {
-            destroyed = await grantExitGrace(context.runtime, bound.tmux);
-          } finally {
-            await bridge.close();
-          }
-        }
+      retryFiles(context);
+      await settleFiles(context);
+      for (const interaction of bridge.unsettledInteractions()) {
+        await settleInteraction(context, interaction, "expired");
       }
     } finally {
-      drafts.close();
+      bridge.stopRecovery();
+      if (owner === null) {
+        try {
+          destroyed = await grantExitGrace(context.runtime, bound.tmux);
+        } finally {
+          await bridge.close();
+        }
+      }
     }
   }
   ended.signal.throwIfAborted();
@@ -444,6 +437,7 @@ async function superviseBound(context, bound, opened, start) {
     destroyed,
     stopped: null,
   };
+  bound.plan = finalPlan(bridge.plan());
   if (owner !== null) {
     const finished = await completeOwnerStop(context, bound, owner.requestedAt);
     return {
@@ -495,12 +489,12 @@ async function settleStopped(context, bound) {
   }
   let failure = stopped.failure;
   try {
-    await observeSessionStop(context.session, bound.session, stopped.textAccepted);
+    await observeSessionStop(context.session, bound.session, stopped.textAccepted, bound.plan);
   } catch (refusal) {
     if (undecided(context, refusal)) return unresolved(null);
     if (!(refusal instanceof KitRefusal) || refusal.code !== "conversation_final_text_pending") throw refusal;
     failure ??= { code: refusal.code, detail: refusal.message };
-    await observeSessionStop(context.session, bound.session);
+    await observeSessionStop(context.session, bound.session, false, bound.plan);
   }
   const report = stoppedReport(bound);
   if (report !== null) await removeContinuation(context.directory, bound.run);
@@ -560,6 +554,7 @@ async function prepareAssignment(context, assignment, resumed) {
     ownerStop: null,
     sealed: null,
     reported: null,
+    plan: null,
   };
   const authority = { token: assignment.session.token, expiresAt: assignment.session.expiresAt };
   const start = {
@@ -642,7 +637,7 @@ async function superviseAssignment(context, assignment, resumed = false) {
       },
       command: context.launcher,
     });
-    await observeSessionStart(context.session, bound.session);
+    opened.frames.identify(await observeSessionStart(context.session, bound.session));
   });
 }
 
@@ -661,7 +656,7 @@ async function superviseRestored(context, binding, authority) {
   const opened = await openRunBridge(context, binding, authority);
   return superviseBound(context, binding, opened, async (spawn) => {
     spawn.committed = true;
-    await observeSessionStart(context.session, binding.session);
+    opened.frames.identify(await observeSessionStart(context.session, binding.session));
   });
 }
 
@@ -848,6 +843,7 @@ async function workerContext(options, dependencies, resident = false) {
     home: dependencies.home ?? homedir(),
     files: { originals: [], failures: [] },
     commands: residentWake(),
+    stream: kitStreamWriter(),
     epochReport: null,
     agentRefresh: Promise.resolve(),
     configurationPath: options.configuration,
@@ -920,7 +916,12 @@ export async function runWorkers(options, dependencies = {}) {
     const watching = (dependencies.watchKitWork ?? watchKitWork)(
       session,
       AbortSignal.any([signal, watcher.signal]),
-      { available: commanded, changed: () => {} },
+      {
+        available: commanded,
+        changed: () => {},
+        opened: context.stream.opened,
+        closed: context.stream.closed,
+      },
       dependencies,
     ).catch((error) => reported(`control stream ended: ${error?.code ?? error?.message ?? error}`));
     try {
@@ -1036,6 +1037,7 @@ export async function runResident(options, dependencies = {}) {
       ),
     (source) =>
       sources === null ? Promise.reject(new KitRefusal("kit_resident_unavailable")) : sources.capture(source),
+    context.stream,
   );
   const serve = async (signal) => {
     context.busy = true;
@@ -1160,7 +1162,13 @@ export async function runResident(options, dependencies = {}) {
     const watching = (dependencies.watchKitWork ?? watchKitWork)(
       context.session,
       AbortSignal.any([signal, watcher.signal]),
-      { available, changed },
+      {
+        available,
+        changed,
+        opened: context.stream.opened,
+        closed: context.stream.closed,
+        viewed: (frame) => served.forward(frame),
+      },
       dependencies,
     ).catch(fail);
     try {