@effect-agent/platform-cloudflare 0.1.0-beta.120 → 0.1.0-beta.122

package/dist/CloudflareThreadClient.d.mts

@@ -1545,8 +1545,50 @@ export declare const encodeHostResponse: (input: AbortRecorded | ApprovalRecorde
     readonly message: string;
     readonly cause?: Schema.Json | undefined;
   } | {
-    readonly _tag: "ThreadNotMaterialized";
+    readonly _tag: "HostProtocolError";
+    readonly message: string;
+  } | {
+    readonly _tag: "AgentInputError";
+    readonly message: string;
+  } | {
+    readonly _tag: "DigestError";
+    readonly message: string;
+    readonly cause?: Schema.Json | undefined;
+  } | {
+    readonly _tag: "AdmissionConflict";
     readonly threadId: string;
+    readonly principal: string;
+    readonly idempotencyKey: string;
+    readonly existingInputDigest: string;
+    readonly attemptedInputDigest: string;
+  } | {
+    readonly _tag: "AdmissionPolicyError";
+    readonly reason: "occupied" | "refused" | "unavailable";
+    readonly code: string;
+    readonly cause?: import("effect-agent/failure-diagnostic").Diagnostic | undefined;
+    readonly stack?: string | undefined;
+  } | {
+    readonly _tag: "SettlementConflict";
+    readonly submissionId: string;
+    readonly existingOutcome: "aborted" | "completed" | "failed";
+  } | {
+    readonly _tag: "ApprovalConflict";
+    readonly submissionId: string;
+    readonly toolCallId: string;
+    readonly existingDecision: "approved" | "denied";
+  } | {
+    readonly _tag: "UnknownResolutionConflict";
+    readonly submissionId: string;
+    readonly toolCallId: string;
+  } | {
+    readonly _tag: "JoinedToHost";
+    readonly submissionId: string;
+    readonly hostSubmissionId: string;
+  } | {
+    readonly _tag: "LedgerError";
+    readonly operation: string;
+    readonly message: string;
+    readonly cause?: import("effect-agent/failure-diagnostic").Diagnostic | undefined;
   } | {
     readonly _tag: "ThreadStoreError";
     readonly operation: string;
@@ -1560,10 +1602,8 @@ export declare const encodeHostResponse: (input: AbortRecorded | ApprovalRecorde
       readonly sequence?: number | undefined;
     } | undefined;
   } | {
-    readonly _tag: "LedgerError";
-    readonly operation: string;
-    readonly message: string;
-    readonly cause?: import("effect-agent/failure-diagnostic").Diagnostic | undefined;
+    readonly _tag: "ThreadNotMaterialized";
+    readonly threadId: string;
   } | {
     readonly _tag: "AppendConflict";
     readonly threadId: string;
@@ -1576,60 +1616,20 @@ export declare const encodeHostResponse: (input: AbortRecorded | ApprovalRecorde
     readonly threadId: string;
     readonly actualEpoch: number;
     readonly attemptedEpoch: number;
-  } | {
-    readonly _tag: "OperationDenied";
-    readonly operation: "abort" | "awaitSettlement" | "explain" | "observe" | "resolveApproval" | "resolveUnknown" | "retry" | "scanObligations" | "verify" | "wake";
-    readonly reason: string;
-    readonly threadId?: string | undefined;
-    readonly submissionId?: string | undefined;
-  } | {
-    readonly _tag: "AdmissionConflict";
-    readonly threadId: string;
-    readonly principal: string;
-    readonly idempotencyKey: string;
-    readonly existingInputDigest: string;
-    readonly attemptedInputDigest: string;
-  } | {
-    readonly _tag: "AdmissionPolicyError";
-    readonly reason: "occupied" | "refused" | "unavailable";
-    readonly code: string;
-    readonly cause?: import("effect-agent/failure-diagnostic").Diagnostic | undefined;
-    readonly stack?: string | undefined;
-  } | {
-    readonly _tag: "AgentInputError";
-    readonly message: string;
-  } | {
-    readonly _tag: "DigestError";
-    readonly message: string;
-    readonly cause?: Schema.Json | undefined;
   } | {
     readonly _tag: "DurableRuntimeFailpointError";
     readonly location: "abort:after-intent" | "approval:after-request-append" | "approval:after-suspend" | "checkpoint:after-save" | "checkpoint:before-save" | "claim:after-claim" | "compaction:after-canonical-append" | "compaction:before-canonical-append" | "input:after-canonical-append" | "join:after-canonical-append" | "join:after-claim" | "policy:after-reservation-append" | "policy:before-reservation-append" | "resolve:after-intent" | "run:after-duration-append" | "run:after-start-append" | "run:before-duration-append" | "run:before-start-append" | "step:after-step-append" | "subagent:after-admit" | "subagent:after-child-abort-intent" | "subagent:after-child-ready" | "subagent:after-join-append" | "subagent:after-release" | "subagent:after-release-pending" | "subagent:after-request-append" | "subagent:after-reserve" | "subagent:after-sibling-settle" | "subagent:after-start-append" | "subagent:after-suspend" | "subagent:before-join-append" | "submit:after-admit" | "submit:after-materialize" | "terminalize:after-canonical-append" | "terminalize:after-reserve" | "tools:after-prepared-append" | "tools:after-unavailable-append" | "tools:before-prepared-append" | "tools:before-unavailable-append" | "turn:after-canonical-append" | "turn:after-response-append" | "turn:after-results-append" | "update:after-canonical-append" | "update:after-delivery-insert" | "update:before-canonical-append" | "update:before-delivery-insert" | "worker:after-completion-append" | "worker:after-origin-append" | "worker:after-report-append" | "worker:after-report-delivery" | "worker:after-source-append" | "worker:after-stop-append" | "worker:after-stop-seal" | "worker:after-subtree-append" | "worker:before-completion-append" | "worker:before-origin-append" | "worker:before-report-append" | "worker:before-report-delivery" | "worker:before-source-append" | "worker:before-stop-append" | "worker:before-stop-seal" | "worker:before-subtree-append";
-  } | {
-    readonly _tag: "SettlementConflict";
-    readonly submissionId: string;
-    readonly existingOutcome: "aborted" | "completed" | "failed";
-  } | {
-    readonly _tag: "JoinedToHost";
-    readonly submissionId: string;
-    readonly hostSubmissionId: string;
   } | {
     readonly _tag: "AdmissionLimitExceeded";
     readonly limit: "database-bytes" | "input-bytes" | "queue-depth";
     readonly actual: number;
     readonly maximum: number;
   } | {
-    readonly _tag: "HostProtocolError";
-    readonly message: string;
-  } | {
-    readonly _tag: "ApprovalConflict";
-    readonly submissionId: string;
-    readonly toolCallId: string;
-    readonly existingDecision: "approved" | "denied";
-  } | {
-    readonly _tag: "UnknownResolutionConflict";
-    readonly submissionId: string;
-    readonly toolCallId: string;
+    readonly _tag: "OperationDenied";
+    readonly operation: "abort" | "awaitSettlement" | "explain" | "observe" | "resolveApproval" | "resolveUnknown" | "retry" | "scanObligations" | "verify" | "wake";
+    readonly reason: string;
+    readonly threadId?: string | undefined;
+    readonly submissionId?: string | undefined;
   };
 }, Schema.SchemaError, never>;
 export declare const decodeHostResponse: (input: unknown, options?: import("effect/SchemaAST").ParseOptions) => Effect.Effect<AbortRecorded | ApprovalRecorded | HostFailed | ObservedPage | ProgressCancelled | ProgressObserved | SettlementReached | SubmissionStatusResponse | SubmitSucceeded | UnknownResolutionRecorded, Schema.SchemaError, never>;

package/dist/{InteractiveBrowser-BQo7QKaP.d.mts → InteractiveBrowser-Cm4xgiGy.d.mts}

@@ -129,7 +129,7 @@ interface BrowserRunInteractiveBrowser {
 }
 declare const BrowserRunInteractiveBinding_base: Context.ServiceClass<BrowserRunInteractiveBinding, "@effect-agent/platform-cloudflare/BrowserRunInteractiveBinding", {
   readonly acquire: (keepAliveMillis: number) => Promise<unknown>;
-  readonly connect: (sessionId: string) => Promise<BrowserRunInteractiveBrowser>;
+  readonly connect: (sessionId: string, signal?: AbortSignal) => Promise<BrowserRunInteractiveBrowser>;
   /** Success proves whole-browser termination or exact-session absence. */
   readonly closeSession: (sessionId: Redacted.Redacted<string>) => Effect.Effect<void, InteractiveBrowserError>;
 }>;
@@ -225,4 +225,4 @@ declare const CloudflareInteractiveBrowser: {
 };
 //#endregion
 export { CloudflareInteractiveBrowserOptions as C, isBrowserRunUndispatchedActionError as D, browserRunInteractiveLayer as E, BrowserRunCleanupError as O, CloudflareInteractiveBrowser as S, browserRunInteractiveImplementation as T, BrowserRunLiveViewRequest as _, BrowserRunInputState as a, BrowserRunPageObservation as b, BrowserRunInteractiveBrowser as c, BrowserRunInteractiveContext as d, BrowserRunInteractiveHost as f, BrowserRunInteractiveSession as g, BrowserRunInteractiveRequestListener as h, BrowserRunHandoffState as i, BrowserRunSessionLifecycle as k, BrowserRunInteractiveCdpSession as l, BrowserRunInteractiveRequest as m, BrowserRunHandoffRequest as n, BrowserRunInteractiveAcquisition as o, BrowserRunInteractivePage as p, BrowserRunHandoffResult as r, BrowserRunInteractiveBinding as s, BrowserRunCloudflareCommand as t, BrowserRunInteractiveCheckpoint as u, BrowserRunLiveViewResult as v, browserRunInteractiveHostLayer as w, BrowserRunViewport as x, BrowserRunPageIdentity as y };
-//# sourceMappingURL=InteractiveBrowser-BQo7QKaP.d.mts.map
+//# sourceMappingURL=InteractiveBrowser-Cm4xgiGy.d.mts.map

package/dist/{InteractiveBrowser-CBUFAECo.mjs → InteractiveBrowser-DXwmvWdA.mjs}

@@ -2,8 +2,8 @@ import { Cause, Clock, Context, Data, Duration, Effect, Encoding, ErrorReporter,
 import { PageScreenshotResult } from "effect-agent/page-screenshot";
 import { SandboxImplementation } from "effect-agent/sandbox";
 import { FetchHttpClient, HttpClient, HttpClientRequest } from "effect/unstable/http";
-import puppeteer from "@cloudflare/puppeteer";
 import { BrowserActionResult, BrowserExpectedTargetState, BrowserFileSelectionResult, BrowserNavigationResult, BrowserScreenshotRequest, BrowserScrollRequest, BrowserSelectFileRequest, BrowserTextResult, InteractiveBrowser, InteractiveBrowserActionError, InteractiveBrowserBusyError, InteractiveBrowserCapacityError, InteractiveBrowserExpiredError, InteractiveBrowserLimitError, InteractiveBrowserPolicy, InteractiveBrowserPolicyDeniedError, InteractiveBrowserProtocolError, InteractiveBrowserTargetUrl, InteractiveBrowserUnsupportedError } from "effect-agent/interactive-browser";
+import puppeteer from "puppeteer-core/lib/esm/puppeteer/puppeteer-core-browser.js";
 //#region src/internal/browser-failure.ts
 /** Source-authored stages and classifications only; never retain SDK text or session capabilities. */
 var BrowserRunFailure = class extends Data.TaggedError("BrowserRunFailure") {
@@ -49,9 +49,41 @@ const reportBrowserCause = (operation, cause) => ErrorReporter.report(Cause.from
 //#endregion
 //#region src/internal/browser-binding.ts
 const Acquired = Schema.Struct({ sessionId: Schema.String.check(Schema.isUUID()) });
+const VersionReply = Schema.fromJsonString(Schema.Struct({
+	id: Schema.optionalKey(Schema.Int),
+	result: Schema.optionalKey(Schema.Unknown),
+	error: Schema.optionalKey(Schema.Unknown)
+}));
+const Version = Schema.Struct({
+	product: Schema.NonEmptyString,
+	protocolVersion: Schema.NonEmptyString
+});
 /** Native transport port shared by both scoped adapters; the Layer owns the foreign binding. */
 var BrowserRunBinding = class extends Context.Service()("@effect-agent/platform-cloudflare/internal/BrowserRunBinding") {
 	static layer(browser) {
+		const upgrade = async (sessionId, operation, signal) => {
+			const response = await browser.fetch(`https://browser-rendering.cloudflare.com/v1/devtools/browser/${sessionId}`, {
+				headers: { Upgrade: "websocket" },
+				...signal === void 0 ? {} : { signal }
+			});
+			if (response.status !== 101) {
+				const failure = new BrowserRunFailure({
+					operation,
+					reason: "provider",
+					status: response.status
+				});
+				try {
+					await response.body?.cancel();
+				} catch {}
+				throw failure;
+			}
+			const socket = response.webSocket;
+			if (socket === null) throw new BrowserRunFailure({
+				operation,
+				reason: "malformed"
+			});
+			return socket;
+		};
 		return Layer.succeed(this)({
 			acquire: async (keepAliveMillis, operation) => {
 				const response = await browser.fetch(`https://browser-rendering.cloudflare.com/v1/devtools/browser?keep_alive=${keepAliveMillis}&recording=false`, { method: "POST" });
@@ -68,31 +100,171 @@ var BrowserRunBinding = class extends Context.Service()("@effect-agent/platform-
 				}
 				return Schema.decodeUnknownSync(Acquired)(await response.json()).sessionId;
 			},
-			connect: async (sessionId, operation) => {
-				let failure;
-				try {
-					return await puppeteer.connect({ fetch: async (input, init) => {
+			connect: (sessionId, operation, signal) => {
+				let socket;
+				let retired = false;
+				let closedByAbort = false;
+				let retirementFailure;
+				const disconnectOperation = operation === "protected.connect" ? "protected.disconnect" : "interactive.disconnect";
+				const transport = {
+					send: (message) => {
+						if (retired || socket === void 0) throw new BrowserRunFailure({
+							operation,
+							reason: "provider"
+						});
+						socket.send(message);
+					},
+					close: () => retireNow()
+				};
+				const onMessage = (event) => {
+					if (!retired) transport.onmessage?.(event.data);
+				};
+				const fence = () => {
+					if (retired) return;
+					retired = true;
+					const notify = transport.onclose;
+					transport.onmessage = void 0;
+					transport.onclose = void 0;
+					try {
+						notify?.();
+					} finally {
+						socket?.removeEventListener("message", onMessage);
+					}
+				};
+				const retireNow = () => {
+					try {
+						fence();
+					} catch (cause) {
+						retirementFailure ??= browserFailure(disconnectOperation, cause);
+					}
+					try {
+						if (socket !== void 0 && socket.readyState < WebSocket.CLOSING) socket.close();
+					} catch (cause) {
+						retirementFailure ??= browserFailure(disconnectOperation, cause);
+					}
+					if (retirementFailure !== void 0) throw retirementFailure;
+				};
+				const abort = () => {
+					closedByAbort = socket?.readyState === WebSocket.OPEN;
+					try {
+						retireNow();
+					} catch {}
+				};
+				signal?.addEventListener("abort", abort, { once: true });
+				return {
+					browser: (async () => {
 						try {
-							const response = await browser.fetch(input, init);
-							if (response.status !== 101) {
-								failure = new BrowserRunFailure({
+							signal?.throwIfAborted();
+							socket = await upgrade(sessionId, operation, signal);
+							socket.accept();
+							if (retired || signal?.aborted) {
+								retireNow();
+								signal?.throwIfAborted();
+								throw new BrowserRunFailure({
 									operation,
-									reason: "provider",
-									status: response.status
+									reason: "provider"
 								});
-								await response.body?.cancel();
-								throw failure;
 							}
-							return response;
+							socket.addEventListener("message", onMessage);
+							socket.addEventListener("close", () => {
+								try {
+									fence();
+								} catch (cause) {
+									retirementFailure ??= browserFailure(disconnectOperation, cause);
+								}
+							}, { once: true });
+							return await puppeteer.connect({ transport });
 						} catch (cause) {
-							failure ??= browserFailure(operation, cause);
-							throw failure;
+							try {
+								retireNow();
+							} catch {}
+							const failure = browserFailure(operation, cause);
+							throw cause instanceof Error && signal?.aborted === true && (cause === signal.reason || closedByAbort && cause.name === "TargetCloseError") ? reportedBrowserError(failure) : failure;
+						} finally {
+							signal?.removeEventListener("abort", abort);
 						}
-					} }, sessionId);
-				} catch (cause) {
-					throw failure ?? browserFailure(operation, cause);
-				}
-			}
+					})(),
+					retire: Effect.callback((resume) => {
+						const connected = socket;
+						const onClose = () => resume(Effect.void);
+						try {
+							retireNow();
+							if (connected === void 0 || connected.readyState === WebSocket.CLOSED) resume(Effect.void);
+							else connected.addEventListener("close", onClose, { once: true });
+						} catch (cause) {
+							resume(Effect.fail(browserFailure(disconnectOperation, cause)));
+						}
+						return Effect.sync(() => connected?.removeEventListener("close", onClose));
+					})
+				};
+			},
+			keepAlive: Effect.fnUntraced(function* (sessionId) {
+				const operation = "protected.keepAlive";
+				const runReport = Effect.runPromiseWith(yield* Effect.context());
+				const release = (socket) => Effect.sync(() => socket.close()).pipe(Effect.catchCause((cause) => reportBrowserCause(operation, cause)));
+				const socket = yield* Effect.acquireRelease(Effect.tryPromise({
+					try: async (signal) => {
+						let acquired;
+						try {
+							acquired = await upgrade(sessionId, operation, signal);
+							acquired.accept();
+							signal.throwIfAborted();
+							return acquired;
+						} catch (cause) {
+							if (acquired !== void 0) await runReport(release(acquired));
+							if (signal.aborted && cause !== signal.reason) await runReport(reportBrowserCause(operation, Cause.fail(cause)));
+							throw cause;
+						}
+					},
+					catch: (cause) => browserFailure(operation, cause)
+				}), release, { interruptible: true });
+				yield* Effect.callback((resume) => {
+					const finish = (result) => {
+						removeListeners();
+						resume(result);
+					};
+					const fail = (reason) => finish(Effect.fail(new BrowserRunFailure({
+						operation,
+						reason
+					})));
+					const onMessage = (event) => {
+						try {
+							if (typeof event.data !== "string" || event.data.length > 16384) {
+								fail("malformed");
+								return;
+							}
+							const reply = Schema.decodeSync(VersionReply)(event.data);
+							if (reply.id !== 1) return;
+							if (reply.error !== void 0) {
+								fail("provider");
+								return;
+							}
+							Schema.decodeUnknownSync(Version)(reply.result);
+							finish(Effect.void);
+						} catch {
+							fail("malformed");
+						}
+					};
+					const onClose = () => fail("provider");
+					const removeListeners = () => {
+						socket.removeEventListener("message", onMessage);
+						socket.removeEventListener("close", onClose);
+						socket.removeEventListener("error", onClose);
+					};
+					socket.addEventListener("message", onMessage);
+					socket.addEventListener("close", onClose);
+					socket.addEventListener("error", onClose);
+					try {
+						socket.send(JSON.stringify({
+							id: 1,
+							method: "Browser.getVersion"
+						}));
+					} catch (cause) {
+						finish(Effect.fail(browserFailure(operation, cause)));
+					}
+					return Effect.sync(removeListeners);
+				});
+			}, Effect.scoped)
 		});
 	}
 };
@@ -412,7 +584,7 @@ var BrowserRunInteractiveBinding = class BrowserRunInteractiveBinding extends Co
 			const viewport = options.viewport === void 0 ? void 0 : yield* decodeViewport(options.viewport);
 			return {
 				acquire: async (keepAliveMillis) => binding.acquire(keepAliveMillis, "interactive.acquire"),
-				connect: async (sessionId) => makeProductionBrowser(await binding.connect(sessionId, "interactive.connect"), viewport),
+				connect: async (sessionId, signal) => makeProductionBrowser(await binding.connect(sessionId, "interactive.connect", signal).browser, sessionId, viewport),
 				closeSession: (sessionId) => lifecycle.close(sessionId).pipe(Effect.mapError((cause) => actionError("close", cause)))
 			};
 		})).pipe(Layer.provide(BrowserRunBinding.layer(options.browser)));
@@ -952,7 +1124,7 @@ const makeProductionContext = (context, viewport) => ({
 		}
 	}
 });
-const makeProductionBrowser = (browser, viewport) => ({
+const makeProductionBrowser = (browser, sessionId, viewport) => ({
 	detach: () => browser.disconnect(),
 	reattach: async (identity) => {
 		const context = browser.browserContexts().find((candidate) => candidate.id === identity.contextId);
@@ -976,7 +1148,7 @@ const makeProductionBrowser = (browser, viewport) => ({
 			if (!isRemoteClosure(cause)) throw cause;
 		}
 	},
-	sessionId: () => browser.sessionId(),
+	sessionId: () => sessionId,
 	isConnected: () => browser.isConnected(),
 	onDisconnected: (listener) => {
 		browser.on("disconnected", listener);
@@ -1548,7 +1720,7 @@ const makeHostService = (binding) => {
 				if (!lifecycle.managedTeardownInstalled) releaseOwner();
 			}));
 			const browser = yield* Effect.acquireRelease(withinDeadline(Effect.tryPromise({
-				try: (signal) => observeLate(signal, closeLateAcquisition(signal, () => binding.connect(sessionIdValue), (acquired) => runCleanup(resume === void 0 ? closeAcquired(acquired) : closeEntry(acquired.detach ?? (async () => {}), "Detaching the browser failed").close))),
+				try: (signal) => observeLate(signal, closeLateAcquisition(signal, () => binding.connect(sessionIdValue, signal), (acquired) => runCleanup(resume === void 0 ? closeAcquired(acquired) : closeEntry(acquired.detach ?? (async () => {}), "Detaching the browser failed").close))),
 				catch: (cause) => resume !== void 0 && cause instanceof BrowserRunFailure && (cause.status === 404 || cause.status === 410) ? expiredError() : protocolError("Connecting to the Browser Run session failed", cause)
 			}).pipe(Effect.timeoutOrElse({
 				duration: "10 seconds",
@@ -1746,4 +1918,4 @@ const CloudflareInteractiveBrowser = {
 //#endregion
 export { reportBrowserCause as C, inheritBrowserReport as S, BrowserRunCleanupError as _, BrowserRunInteractiveCheckpoint as a, BrowserRunFailure as b, BrowserRunLiveViewResult as c, BrowserRunViewport as d, CloudflareInteractiveBrowser as f, isBrowserRunUndispatchedActionError as g, browserRunInteractiveLayer as h, BrowserRunInteractiveBinding as i, BrowserRunPageIdentity as l, browserRunInteractiveImplementation as m, BrowserRunHandoffResult as n, BrowserRunInteractiveHost as o, browserRunInteractiveHostLayer as p, BrowserRunHandoffState as r, BrowserRunLiveViewRequest as s, BrowserRunHandoffRequest as t, BrowserRunPageObservation as u, BrowserRunSessionLifecycle as v, reportedBrowserError as w, browserFailure as x, BrowserRunBinding as y };
 
-//# sourceMappingURL=InteractiveBrowser-CBUFAECo.mjs.map
+//# sourceMappingURL=InteractiveBrowser-DXwmvWdA.mjs.map