@osolmaz/pi-workflows 0.16.1 → 0.16.3

package/src/channels/adapter-entry.ts

@@ -20,7 +20,7 @@ type ChannelAdapterReport = ChannelAdapterMessage extends infer Message
     : never
   : never;
 
-class AdapterHostConnection {
+class AdapterServerConnection {
   private sequence = 0;
   private revision = 0;
   private readonly lines = createInterface({ input: process.stdin, crlfDelay: Infinity })[
@@ -43,13 +43,13 @@ class AdapterHostConnection {
       await new Promise<void>((resolve) => process.stdout.once("drain", resolve));
     }
     const next = await this.lines.next();
-    if (next.done) throw new Error("Workflow host closed the channel adapter connection");
+    if (next.done) throw new Error("Workflow server closed the channel adapter connection");
     const response = parseChannelAdapterResponse(Buffer.from(next.value, "utf8"));
     if (response.sequence !== this.sequence) {
-      throw new Error("Workflow host returned a mismatched channel response");
+      throw new Error("Workflow server returned a mismatched channel response");
     }
     if (response.outcome !== "accepted") {
-      throw new Error(response.error ?? "Workflow host rejected the channel adapter message");
+      throw new Error(response.error ?? "Workflow server rejected the channel adapter message");
     }
     this.revision = response.revision;
     return response;
@@ -58,7 +58,7 @@ class AdapterHostConnection {
 
 export async function runChannelAdapter(): Promise<number> {
   const launch = readLaunch();
-  const host = new AdapterHostConnection(launch);
+  const server = new AdapterServerConnection(launch);
   const telegram = new TelegramAdapter({
     profile: launch.profile,
     token: launch.token,
@@ -85,7 +85,7 @@ export async function runChannelAdapter(): Promise<number> {
     stopping = true;
   });
 
-  let response = await host.report({
+  let response = await server.report({
     kind: "channel.ready",
     stableMessageId: controlId("ready"),
     cursor,
@@ -94,7 +94,7 @@ export async function runChannelAdapter(): Promise<number> {
     const command = response.command;
     if (command === null) {
       await new Promise((resolve) => setTimeout(resolve, 100));
-      response = await host.report({
+      response = await server.report({
         kind: "channel.ready",
         stableMessageId: controlId("ready"),
         cursor,
@@ -108,7 +108,7 @@ export async function runChannelAdapter(): Promise<number> {
     if (command.kind === "channel.present") {
       try {
         const messages = await telegram.present(command.request);
-        response = await host.report({
+        response = await server.report({
           kind: "channel.present",
           stableMessageId: command.stableMessageId,
           decisionId: command.request.decisionId,
@@ -118,7 +118,7 @@ export async function runChannelAdapter(): Promise<number> {
           messages,
         });
       } catch (error) {
-        response = await host.report({
+        response = await server.report({
           kind: "channel.present",
           stableMessageId: command.stableMessageId,
           decisionId: command.request.decisionId,
@@ -134,7 +134,7 @@ export async function runChannelAdapter(): Promise<number> {
     if (command.kind === "channel.settle") {
       try {
         await telegram.settle(command.outcome, command.response, command.messages);
-        response = await host.report({
+        response = await server.report({
           kind: "channel.settle",
           stableMessageId: command.stableMessageId,
           decisionId: command.request.decisionId,
@@ -143,7 +143,7 @@ export async function runChannelAdapter(): Promise<number> {
           state: "confirmed",
         });
       } catch (error) {
-        response = await host.report({
+        response = await server.report({
           kind: "channel.settle",
           stableMessageId: command.stableMessageId,
           decisionId: command.request.decisionId,
@@ -160,7 +160,7 @@ export async function runChannelAdapter(): Promise<number> {
     const polled = await telegram.poll(command.cursor);
     cursor = polled.cursor;
     for (const answer of polled.answers) {
-      await host.report({
+      await server.report({
         kind: "channel.answer",
         stableMessageId: channelStableMessageId([
           launch.profile,
@@ -177,14 +177,14 @@ export async function runChannelAdapter(): Promise<number> {
         cursor,
       });
     }
-    response = await host.report({
+    response = await server.report({
       kind: "channel.ready",
       stableMessageId: controlId("ready"),
       cursor,
     });
   }
 
-  await host.report({
+  await server.report({
     kind: "channel.exiting",
     stableMessageId: controlId("exiting"),
     cursor,

package/src/client/client.ts

@@ -20,7 +20,7 @@ import {
   type ClientResponse,
 } from "./protocol.js";
 import type {
-  ResolvedControllerInitialization,
+  ResolvedResourceManagerInitialization,
   ResolvedSettingsChange,
   ResolvedWorkflowLaunch,
 } from "./resolver.js";
@@ -55,7 +55,7 @@ export class WorkflowClientVersionError extends Error {
 export type WorkflowClientOptions = {
   clientId?: string;
   databasePath?: string;
-  hostEntryPath?: string;
+  serverEntryPath?: string;
   env?: Record<string, string>;
 };
 
@@ -64,7 +64,7 @@ export class WorkflowClient {
   readonly databasePath: string;
   readonly endpoint: string;
 
-  private readonly hostEntryPath: string | undefined;
+  private readonly serverEntryPath: string | undefined;
   private readonly env: Record<string, string> | undefined;
   private socket: Socket | null = null;
   private connectTask: Promise<ClientHello> | null = null;
@@ -78,7 +78,7 @@ export class WorkflowClient {
     this.clientId = options.clientId ?? `client-${randomUUID()}`;
     this.databasePath = options.databasePath ?? workflowStatePath();
     this.endpoint = clientSocketPath(this.databasePath);
-    this.hostEntryPath = options.hostEntryPath;
+    this.serverEntryPath = options.serverEntryPath;
     this.env = options.env;
   }
 
@@ -143,7 +143,7 @@ export class WorkflowClient {
     const response = await this.request({ operation: "view.run.get", runId });
     if (response.outcome === "notFound") return null;
     if (response.outcome !== "accepted" || !isWorkflowRunView(response.receipt, runId)) {
-      throw new Error(response.error ?? "Workflow host returned an invalid run view");
+      throw new Error(response.error ?? "Workflow server returned an invalid run view");
     }
     return response.receipt;
   }
@@ -216,13 +216,13 @@ export class WorkflowClient {
       }
     }
     throw new Error(
-      `Workflow host did not become ready: ${lastError instanceof Error ? lastError.message : String(lastError)}`,
+      `Workflow server did not become ready: ${lastError instanceof Error ? lastError.message : String(lastError)}`,
     );
   }
 
   async ensureRunning(): Promise<ClientResponse> {
     await this.ensureAvailable();
-    return await this.request({ operation: "host.status" });
+    return await this.request({ operation: "server.status" });
   }
 
   async readContent(
@@ -367,23 +367,23 @@ export class WorkflowClient {
     )) as unknown as ResolvedWorkflowLaunch;
   }
 
-  async resolveControllerInitialization(options: {
+  async resolveResourceManagerInitialization(options: {
     cwd: string;
-    controllerName: string;
+    resourceManagerName: string;
     spec: JsonValue;
     timeoutMs?: number;
-  }): Promise<ResolvedControllerInitialization> {
+  }): Promise<ResolvedResourceManagerInitialization> {
     return (await this.runResolver(
       {
-        schema: "pi-workflows.controller-initialization-request.v1",
+        schema: "pi-workflows.resource-manager-initialization-request.v1",
         cwd: options.cwd,
-        controllerName: options.controllerName,
+        resourceManagerName: options.resourceManagerName,
         spec: options.spec,
       },
       options.cwd,
-      "pi-workflows.resolved-controller-initialization.v1",
+      "pi-workflows.resolved-resource-manager-initialization.v1",
       options.timeoutMs,
-    )) as unknown as ResolvedControllerInitialization;
+    )) as unknown as ResolvedResourceManagerInitialization;
   }
 
   async resolveSettingsChange(options: {
@@ -498,7 +498,7 @@ export class WorkflowClient {
 
   private async send(request: ClientRequest, signal?: AbortSignal): Promise<ClientResponse> {
     const socket = this.socket;
-    if (socket === null || socket.destroyed) throw new Error("Workflow host is unavailable");
+    if (socket === null || socket.destroyed) throw new Error("Workflow server is unavailable");
     if (signal?.aborted === true) throw abortReason(signal);
     if (this.pending.has(request.requestId)) {
       throw new Error(`Workflow request is already pending: ${request.requestId}`);
@@ -549,10 +549,11 @@ export class WorkflowClient {
         for (const frame of decoder.push(chunk)) {
           const message = parseClientMessage(frame);
           if (!receivedHello) {
-            if (message.type !== "hello") throw new Error("Workflow host did not send hello first");
+            if (message.type !== "hello")
+              throw new Error("Workflow server did not send hello first");
             if (message.packageVersion !== CLIENT_PACKAGE_VERSION) {
               throw new WorkflowClientVersionError(
-                `Workflow client version mismatch: host ${message.packageVersion}, client ${CLIENT_PACKAGE_VERSION}. Install matching pi-workflows and piw packages.`,
+                `Workflow client version mismatch: server ${message.packageVersion}, client ${CLIENT_PACKAGE_VERSION}. Install matching pi-workflows and piw packages.`,
               );
             }
             receivedHello = true;
@@ -597,9 +598,9 @@ export class WorkflowClient {
       helloReject(error);
     });
     socket.once("close", () => {
-      if (!receivedHello) helloReject(new Error("Workflow host closed before hello"));
+      if (!receivedHello) helloReject(new Error("Workflow server closed before hello"));
       if (this.socket === socket) {
-        this.resetConnection(new Error("Workflow host connection closed"));
+        this.resetConnection(new Error("Workflow server connection closed"));
         this.scheduleReconnect();
       }
     });
@@ -611,7 +612,7 @@ export class WorkflowClient {
         helloPromise.then(() => undefined),
         new Promise<never>((_, reject) => {
           connectTimer = setTimeout(
-            () => reject(new Error("Workflow host connection timed out")),
+            () => reject(new Error("Workflow server connection timed out")),
             CONNECT_TIMEOUT_MS,
           );
           connectTimer.unref?.();
@@ -620,7 +621,7 @@ export class WorkflowClient {
       const hello = await Promise.race([
         helloPromise,
         delay(CONNECT_TIMEOUT_MS).then(() => {
-          throw new Error("Workflow host hello timed out");
+          throw new Error("Workflow server hello timed out");
         }),
       ]);
       await this.restoreSubscriptions();
@@ -702,7 +703,7 @@ export class WorkflowClient {
     }
   }
 
-  private resetConnection(reason = new Error("Workflow host is unavailable")): void {
+  private resetConnection(reason = new Error("Workflow server is unavailable")): void {
     const socket = this.socket;
     this.socket = null;
     this.hello = null;
@@ -718,7 +719,7 @@ export class WorkflowClient {
             type: "event",
             subscriptionId,
             event: "unavailable",
-            payload: { message: "Workflow host connection is unavailable." },
+            payload: { message: "Workflow server connection is unavailable." },
           });
         } catch {
           // One renderer cannot block reconnection for other subscriptions.
@@ -742,8 +743,8 @@ export class WorkflowClient {
     expectedSchema: string,
     timeoutMs = RESOLVER_TIMEOUT_MS,
   ): Promise<JsonValue> {
-    const builtEntry = fileURLToPath(new URL("../host/resolver-entry.js", import.meta.url));
-    const sourceEntry = fileURLToPath(new URL("../host/resolver-entry.ts", import.meta.url));
+    const builtEntry = fileURLToPath(new URL("../server/resolver-entry.js", import.meta.url));
+    const sourceEntry = fileURLToPath(new URL("../server/resolver-entry.ts", import.meta.url));
     const args = fs.existsSync(builtEntry)
       ? [builtEntry]
       : ["--import", createRequire(import.meta.url).resolve("tsx"), sourceEntry];
@@ -791,11 +792,11 @@ export class WorkflowClient {
   }
 
   private startDetached(): void {
-    const builtEntry = fileURLToPath(new URL("../host/host-entry.js", import.meta.url));
-    const sourceEntry = fileURLToPath(new URL("../host/host-entry.ts", import.meta.url));
-    const entry = this.hostEntryPath ?? builtEntry;
+    const builtEntry = fileURLToPath(new URL("../server/server-entry.js", import.meta.url));
+    const sourceEntry = fileURLToPath(new URL("../server/server-entry.ts", import.meta.url));
+    const entry = this.serverEntryPath ?? builtEntry;
     const args =
-      this.hostEntryPath === undefined && !fs.existsSync(builtEntry)
+      this.serverEntryPath === undefined && !fs.existsSync(builtEntry)
         ? ["--import", createRequire(import.meta.url).resolve("tsx"), sourceEntry]
         : [entry];
     const child = spawn(process.execPath, [...args, "--database", this.databasePath], {
@@ -829,7 +830,7 @@ function parseWorkflowRunListPage(value: unknown): WorkflowRunListPage {
         isRecord(item) && typeof item.runId === "string" && typeof item.workflowName === "string",
     )
   ) {
-    throw new Error("Workflow host returned an invalid run list page");
+    throw new Error("Workflow server returned an invalid run list page");
   }
   return value as unknown as WorkflowRunListPage;
 }
@@ -851,7 +852,7 @@ function abortReason(signal: AbortSignal): Error {
 
 function waitForSocketDrain(socket: Socket, signal?: AbortSignal): Promise<void> {
   if (signal?.aborted === true) return Promise.reject(abortReason(signal));
-  if (socket.destroyed) return Promise.reject(new Error("Workflow host connection closed"));
+  if (socket.destroyed) return Promise.reject(new Error("Workflow server connection closed"));
   return new Promise((resolve, reject) => {
     const cleanup = (): void => {
       socket.off("drain", onDrain);
@@ -865,7 +866,7 @@ function waitForSocketDrain(socket: Socket, signal?: AbortSignal): Promise<void>
       else reject(error);
     };
     const onDrain = (): void => settle();
-    const onClose = (): void => settle(new Error("Workflow host connection closed"));
+    const onClose = (): void => settle(new Error("Workflow server connection closed"));
     const onError = (error: Error): void => settle(error);
     const onAbort = (): void => settle(abortReason(signal as AbortSignal));
     socket.once("drain", onDrain);

package/src/client/protocol.ts

@@ -28,13 +28,13 @@ export const CLIENT_OPERATIONS = [
   "channel.status",
   "channel.reload",
   "channel.recover",
-  "controller.list",
-  "controller.get",
-  "controller.apply",
-  "controller.reconcile",
-  "controller.delete",
-  "host.status",
-  "host.stop",
+  "resourceManager.list",
+  "resourceManager.get",
+  "resourceManager.apply",
+  "resourceManager.reconcile",
+  "resourceManager.delete",
+  "server.status",
+  "server.stop",
   "view.runs.watch",
   "view.runs.page",
   "view.run.get",
@@ -185,10 +185,15 @@ export function clientSocketPath(databasePath: string): string {
 export class NdjsonFrameDecoder {
   private buffered = Buffer.alloc(0);
 
+  constructor(
+    private readonly maxMessageBytes = MAX_PROTOCOL_MESSAGE_BYTES,
+    private readonly oversizedMessage = "Client protocol message exceeds 1 MiB",
+  ) {}
+
   push(chunk: Buffer): Buffer[] {
     this.buffered = Buffer.concat([this.buffered, chunk]);
-    if (this.buffered.byteLength > MAX_PROTOCOL_MESSAGE_BYTES && !this.buffered.includes(0x0a)) {
-      throw new ClientProtocolError("Client protocol message exceeds 1 MiB");
+    if (this.buffered.byteLength > this.maxMessageBytes && !this.buffered.includes(0x0a)) {
+      throw new ClientProtocolError(this.oversizedMessage);
     }
     const frames: Buffer[] = [];
     for (;;) {
@@ -197,8 +202,8 @@ export class NdjsonFrameDecoder {
       const frame = this.buffered.subarray(0, newline);
       this.buffered = this.buffered.subarray(newline + 1);
       if (frame.byteLength === 0) continue;
-      if (frame.byteLength + 1 > MAX_PROTOCOL_MESSAGE_BYTES) {
-        throw new ClientProtocolError("Client protocol message exceeds 1 MiB");
+      if (frame.byteLength + 1 > this.maxMessageBytes) {
+        throw new ClientProtocolError(this.oversizedMessage);
       }
       frames.push(frame);
     }

package/src/client/resolver.ts

@@ -9,10 +9,10 @@ export type ResolvedWorkflowLaunch = {
   definitionSnapshot: JsonValue;
 };
 
-export type ResolvedControllerInitialization = {
-  schema: "pi-workflows.resolved-controller-initialization.v1";
-  controllerName: string;
-  controllerPath: string;
+export type ResolvedResourceManagerInitialization = {
+  schema: "pi-workflows.resolved-resource-manager-initialization.v1";
+  resourceManagerName: string;
+  resourceManagerPath: string;
   sourceHash: string;
   initialStatus: JsonValue;
 };

package/src/client/view.ts

@@ -3,6 +3,8 @@ import type { WorkflowMessage, WorkflowTurn } from "../state/workflow-messages.j
 
 export const RUN_VIEW_SCHEMA = "pi-workflows.run-view.v1" as const;
 export const SESSION_VIEW_SCHEMA = "pi-workflows.session-view.v1" as const;
+export const WORKFLOW_TURN_REPORT_RECEIPT_SCHEMA =
+  "pi-workflows.workflow-turn-report-receipt.v1" as const;
 
 export type WorkflowDisplayStatus =
   | "queued"
@@ -17,7 +19,7 @@ export type WorkflowDisplayStatus =
 
 export type WorkflowDisplay = {
   status: WorkflowDisplayStatus;
-  activity: "supervised_worker" | "origin_turn" | null;
+  activity: "supervised_runner" | "origin_turn" | null;
   controls: Array<"pause" | "resume" | "cancel" | "answer" | "review">;
   reason: string | null;
   reasonContent?: JsonValue;
@@ -142,6 +144,12 @@ export type WorkflowBranchReport = {
   hasPendingMessages: boolean;
 };
 
+export type WorkflowTurnReportReceipt = {
+  schema: typeof WORKFLOW_TURN_REPORT_RECEIPT_SCHEMA;
+  ownership: "active" | "settled" | "absent";
+  turn: WorkflowTurn | null;
+};
+
 export type WorkflowTurnReport =
   | {
       state: "started";