@agentshouse/kit 0.1.0-alpha.17 → 0.1.0-alpha.19

package/src/worker.js

@@ -10,15 +10,16 @@ import {
 } from "./agents.js";
 import { readBindings, removeBinding, writeBinding } from "./binding.js";
 import { readContinuation, readContinuationRuns, writeContinuation, removeContinuation } from "./continuation.js";
-import { openBridge } from "./bridge.js";
+import { bridgedFrame, openBridge } from "./bridge.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 } from "./mcp.js";
 import { inheritedEnvironment } from "./command.js";
 import { watchKitWork } from "./kit-work-stream.js";
-import { applyWorkingCopies, workingCopyPaths } from "./working-copy.js";
+import { applyWorkingCopies, ownerCaller, pushWorkingCopy, workingCopyPaths } from "./working-copy.js";
 import { readConfiguration } from "./configuration.js";
 import { launchBase, readyLaunchDirectory } from "./directory.js";
 import {
@@ -32,8 +33,9 @@ import {
   WORKER_HEARTBEAT_MS,
   WORKER_INHERITED_ENVIRONMENT,
   WORKER_SUPERVISION_POLL_MS,
+  WORKING_COPY_PUSH_METHOD,
 } from "./contract.js";
-import { EpochReportRequired, houseFailed, KitRefusal } from "./refusal.js";
+import { EpochReportRequired, formatCommandError, houseFailed, KitRefusal } from "./refusal.js";
 import {
   acceptAssistantText,
   acquireCommands,
@@ -270,6 +272,52 @@ function endOnEpochReport(ended, act) {
   };
 }
 
+function refusedWith(text) {
+  const conflicts = answerYaml(text.slice(text.indexOf("\n") + 1))?.conflicts;
+  const current = Array.isArray(conflicts)
+    ? conflicts.map(({ path, state, revision }) =>
+        state === "absent" ? { path, revision: null, content: null } : { path, revision },
+      )
+    : null;
+  return { refused: { code: text.split(":")[0].trim(), text, current } };
+}
+
+function acceptedWith(text) {
+  const written = answerYaml(text).results.map(({ path, op, revision }) =>
+    op === "remove" ? { path, revision: null, content: null } : { path, revision },
+  );
+  return { refused: null, written };
+}
+
+async function sessionPush(context, bound, authority, frame, signal) {
+  const edit = async (body, sent) => {
+    const answer = await callHouseMcp(
+      context.session,
+      await sessionAuthority(context.session, bound.session, authority, sent),
+      bridgedFrame(
+        { jsonrpc: "2.0", id: 1, method: "tools/call", params: { name: "edit", arguments: { changes: body.changes } } },
+        body.operation_id,
+      ),
+      sent,
+    );
+    if (answer.error !== undefined) return refusedWith(answer.error.message ?? "kit_house_refused");
+    const text = answerText(answer.result);
+    return answer.result?.isError === true ? refusedWith(text) : acceptedWith(text);
+  };
+  let outcome;
+  try {
+    outcome = await pushWorkingCopy(context, frame.params, { binding: { session: bound.session }, submit: edit }, signal);
+  } catch (refusal) {
+    if (!(refusal instanceof KitRefusal)) throw refusal;
+    outcome = { refused: true, text: refusal.message };
+  }
+  return {
+    jsonrpc: "2.0",
+    id: frame.id,
+    result: { content: [{ type: "text", text: outcome.text }], ...(outcome.refused ? { isError: true } : {}) },
+  };
+}
+
 async function openRunBridge(context, bound, authority, start) {
   const ended = new AbortController();
   const handed = (act) => endOnEpochReport(ended, act);
@@ -291,8 +339,9 @@ async function openRunBridge(context, bound, authority, start) {
     ),
     secret: (interaction, ceremony) => awaitSecretInput(context.session, interaction, ceremony),
     settle: handed((interaction, outcome) => settleInteraction(context, interaction, outcome)),
-    forward: handed((frame, signal) =>
-      localFiles(async (sent) =>
+    forward: handed((frame, signal) => frame.method === WORKING_COPY_PUSH_METHOD
+      ? sessionPush(context, bound, authority, frame, signal)
+      : localFiles(async (sent) =>
         callHouseMcp(
           context.session,
           await sessionAuthority(context.session, bound.session, authority, signal),
@@ -960,7 +1009,16 @@ export async function runResident(options, dependencies = {}) {
   const wake = residentWake();
   const update = residentUpdate(context, wake);
   context.update = update;
-  const served = await serveResident(session, context.directory, options.signal, (serving) => update.request(serving));
+  const served = await serveResident(
+    session,
+    context.directory,
+    options.signal,
+    (serving) => update.request(serving),
+    (request, signal) =>
+      pushWorkingCopy({ directory: context.directory, session }, request, ownerCaller(session), signal).catch(
+        (error) => ({ refused: true, text: formatCommandError(error) }),
+      ),
+  );
   const serve = async (signal) => {
     context.busy = true;
     const watcher = new AbortController();