@rivus/runtime 0.17.0 → 0.18.1

package/dist/chunks/user-input-xml.js

@@ -1,5 +1,5 @@
 import { a as isValidUserInput } from "./agent-user-input.js";
-import { Effect, Either } from "effect";
+import { Effect, Result } from "effect";
 //#region src/core/application/agent-execution/loop/agent-loop.ts
 function createAgentLoopTextDelta(delta) {
 	return {
@@ -161,19 +161,19 @@ function renderImage(part, context) {
 		size: part.size,
 		index: images.length + 1
 	})) return Effect.succeed(renderUnavailableNoticeAndRecord(part.attachmentId, "超出本次图片输入预算或当前模型不支持视觉", unavailable));
-	return access.readBytes(part.attachmentId).pipe(Effect.either, Effect.map((result) => {
-		if (Either.isLeft(result)) return renderUnavailableNoticeAndRecord(part.attachmentId, "图片在执行环境中不可读", unavailable);
-		if (!withinImageBudget(result.right.byteLength) || result.right.byteLength === 0) return renderUnavailableNoticeAndRecord(part.attachmentId, "超出本次图片输入预算或图片为空", unavailable);
+	return access.readBytes(part.attachmentId).pipe(Effect.result, Effect.map((result) => {
+		if (Result.isFailure(result)) return renderUnavailableNoticeAndRecord(part.attachmentId, "图片在执行环境中不可读", unavailable);
+		if (!withinImageBudget(result.success.byteLength) || result.success.byteLength === 0) return renderUnavailableNoticeAndRecord(part.attachmentId, "超出本次图片输入预算或图片为空", unavailable);
 		if (access.canProvideImage && !access.canProvideImage({
 			mimeType: part.mimeType,
-			size: result.right.byteLength,
+			size: result.success.byteLength,
 			index: images.length + 1
 		})) return renderUnavailableNoticeAndRecord(part.attachmentId, "超出本次图片输入预算或当前模型不支持视觉", unavailable);
 		const imageIndex = images.length + 1;
 		images.push({
 			type: "image",
 			attachmentId: part.attachmentId,
-			data: Buffer.from(result.right).toString("base64"),
+			data: Buffer.from(result.success).toString("base64"),
 			imageIndex,
 			mimeType: part.mimeType
 		});
@@ -183,9 +183,9 @@ function renderImage(part, context) {
 }
 function renderAttachment(part, access, markUsable, unavailable) {
 	if (!access) return Effect.succeed(renderUnavailableNoticeAndRecord(part.fileName ?? part.attachmentId, "执行环境未提供文件读取能力", unavailable));
-	return access.materialize(part.attachmentId).pipe(Effect.either, Effect.map((result) => {
-		if (Either.isLeft(result)) return renderUnavailableNoticeAndRecord(part.fileName ?? part.attachmentId, "附件无法物化到执行环境", unavailable);
-		const value = result.right;
+	return access.materialize(part.attachmentId).pipe(Effect.result, Effect.map((result) => {
+		if (Result.isFailure(result)) return renderUnavailableNoticeAndRecord(part.fileName ?? part.attachmentId, "附件无法物化到执行环境", unavailable);
+		const value = result.success;
 		const canUnderstand = access.canUnderstand?.({
 			mediaKind: part.mediaKind,
 			mimeType: value.mimeType

package/dist/index.js

@@ -1,6 +1,6 @@
 import { a as createInvocationAuthority, i as InvalidInvocationAuthority, n as InvalidToolInput, o as resolveInvocationAuthority, r as createToolInputDigest, s as normalizeAgentInvocation, t as requiresToolApproval } from "./chunks/tool-risk-policy.js";
 import { i as isAgentSteeringRequest, n as cloneAgentSteeringInput, o as projectUserInputText, r as cloneUserInput, t as ATTACHMENT_RECOVERY_COMMAND } from "./chunks/agent-user-input.js";
-import { Deferred, Effect, Option, Queue, Stream } from "effect";
+import { Deferred, Effect, Option, Queue, Semaphore, Stream } from "effect";
 import { unwrapExit } from "@rivus/platform/effect";
 import { createHash } from "node:crypto";
 import { appendFile, chmod, lstat, mkdir, readFile, realpath, stat } from "node:fs/promises";
@@ -2023,10 +2023,10 @@ function createAgentRunStreams(runPrompt) {
 	};
 }
 function createProjectedRunStream(runPrompt, command, project) {
-	return Stream.asyncEffect((emit) => runPrompt(command, (event, state, previousState) => Option.match(project(event, state, previousState), {
+	return Stream.callback((queue) => runPrompt(command, (event, state, previousState) => Option.match(project(event, state, previousState), {
 		onNone: () => Effect.void,
-		onSome: (value) => Effect.promise(() => emit.single(value))
-	}), "stream interrupted").pipe(Effect.flatMap(() => Effect.promise(() => emit.end())), Effect.catchAll((error) => Effect.promise(() => emit.fail(error)))));
+		onSome: (value) => Queue.offer(queue, value)
+	}), "stream interrupted").pipe(Effect.flatMap(() => Queue.end(queue)), Effect.catchCause((cause) => Queue.failCause(queue, cause)), Effect.forkScoped, Effect.asVoid), { bufferSize: 16 });
 }
 //#endregion
 //#region src/core/application/agent-execution/execution/agent-loop-event-mapper.ts
@@ -2146,13 +2146,13 @@ function createSteeringChannel() {
 			nextInput: () => Queue.take(queue),
 			close: () => Effect.gen(function* () {
 				closed = true;
-				return Array.from(yield* Queue.takeAll(queue)).map(toText);
+				return Array.from(yield* Queue.clear(queue)).map(toText);
 			}),
 			closeInput: () => Effect.gen(function* () {
 				closed = true;
-				return Array.from(yield* Queue.takeAll(queue));
+				return Array.from(yield* Queue.clear(queue));
 			}),
-			push: (input) => Effect.sync(() => !closed && Queue.unsafeOffer(queue, input))
+			push: (input) => Effect.sync(() => !closed && Queue.offerUnsafe(queue, input))
 		};
 	}));
 }
@@ -2239,7 +2239,7 @@ function createAgentHarness(options) {
 			for (const sink of options.eventSinks ?? []) yield* Effect.try({
 				try: () => sink.append(event),
 				catch: (error) => error
-			}).pipe(Effect.flatMap((appendEffect) => appendEffect), Effect.catchAll((error) => Effect.fail(new AgentEventSinkFailed(event.runId, event.type, error))));
+			}).pipe(Effect.flatMap((appendEffect) => appendEffect), Effect.catch((error) => Effect.fail(new AgentEventSinkFailed(event.runId, event.type, error))));
 			events.push(event);
 			const update = queryStore.project(event);
 			state = update.state;
@@ -2249,7 +2249,7 @@ function createAgentHarness(options) {
 		});
 		const record = (event) => Effect.gen(function* () {
 			const update = yield* project(event);
-			yield* emit(update.event, update.state, update.previousState).pipe(Effect.catchAll((error) => Effect.fail(new AgentEventHandlerFailed(event.runId, event.type, error, state))));
+			yield* emit(update.event, update.state, update.previousState).pipe(Effect.catch((error) => Effect.fail(new AgentEventHandlerFailed(event.runId, event.type, error, state))));
 		});
 		const recordWithoutEmit = (event) => project(event).pipe(Effect.asVoid);
 		const recordInterruptedRun = Effect.gen(function* () {
@@ -2265,7 +2265,7 @@ function createAgentHarness(options) {
 				occurredAt: interruptedAt,
 				runId,
 				type: "agent_run_cancelled"
-			}).pipe(Effect.catchAll(() => Effect.void));
+			}).pipe(Effect.catch(() => Effect.void));
 			settled = true;
 		});
 		return yield* Effect.gen(function* () {
@@ -2306,10 +2306,10 @@ function createAgentHarness(options) {
 			const loop = Effect.try({
 				try: () => options.loop.run(loopInput),
 				catch: (error) => error
-			}).pipe(Effect.flatMap((loopStream) => Stream.runForEach(loopStream.pipe(Stream.interruptWhenDeferred(cancellation.deferred)), (event) => Effect.gen(function* () {
+			}).pipe(Effect.flatMap((loopStream) => Stream.runForEach(loopStream.pipe(Stream.interruptWhen(Deferred.await(cancellation.deferred))), (event) => Effect.gen(function* () {
 				const occurredAt = yield* options.clock.now;
 				yield* record(toDomainEvent(runId, command.sessionKey, event, occurredAt));
-			}))), Effect.catchAll((error) => {
+			}))), Effect.catch((error) => {
 				if (error instanceof AgentEventSinkFailed || error instanceof AgentEventHandlerFailed) return Effect.fail(error);
 				return Effect.gen(function* () {
 					const occurredAt = yield* options.clock.now;
@@ -2324,16 +2324,16 @@ function createAgentHarness(options) {
 					return yield* Effect.fail(new AgentLoopFailed(runId, errorMessage, error, state));
 				});
 			}));
-			yield* options.runTimeoutMs === void 0 ? loop : Effect.raceFirst(loop, Effect.sleep(options.runTimeoutMs).pipe(Effect.flatMap(() => {
+			yield* options.runTimeoutMs === void 0 ? loop : Effect.raceFirst(loop, Effect.sleep(options.runTimeoutMs).pipe(Effect.flatMap(() => Effect.gen(function* () {
 				const request = {
 					reason: `run timed out after ${options.runTimeoutMs}ms`,
 					runId,
 					sessionKey: command.sessionKey
 				};
 				cancellation.requested = request;
+				yield* Deferred.succeed(cancellation.deferred, request);
 				cancellation.abortController.abort(request);
-				return Deferred.succeed(cancellation.deferred, request);
-			}), Effect.asVoid));
+			}).pipe(Effect.uninterruptible)), Effect.asVoid));
 			if (cancellation.requested) {
 				const cancelledAt = yield* options.clock.now;
 				yield* record({
@@ -2400,12 +2400,11 @@ function createAgentHarness(options) {
 			runId: activeRun.runId,
 			sessionKey: activeRun.sessionKey
 		};
-		const completed = yield* Deferred.succeed(activeCancellation.deferred, request);
-		if (completed) {
-			activeCancellation.requested = request;
-			activeCancellation.abortController.abort(request);
-		}
-		return completed;
+		const cancellation = activeCancellation;
+		cancellation.requested = request;
+		const requested = yield* Deferred.succeed(cancellation.deferred, request);
+		cancellation.abortController.abort(request);
+		return requested;
 	});
 	const requestSteering = (runId, text) => requestSteeringInput(runId, text);
 	const requestSteeringInput = (runId, input) => Effect.gen(function* () {
@@ -2580,7 +2579,7 @@ function createRunAdmission(options) {
 		const remaining = input.deadlineAt === void 0 ? void 0 : remainingUntil(options.clock, input.deadlineAt);
 		if (remaining !== void 0 && remaining <= 0) return Effect.fail(new ModelChangeBoundaryDeadlineError("Run admission deadline has passed"));
 		if (open) return Effect.sync(createLease);
-		const waiting = Effect.async((resume) => {
+		const waiting = Effect.callback((resume) => {
 			let settled = false;
 			let waiter;
 			let onAbort;
@@ -2608,9 +2607,9 @@ function createRunAdmission(options) {
 			if (onAbort && signal) signal.addEventListener("abort", onAbort, { once: true });
 			return Effect.sync(cleanup);
 		});
-		return remaining === void 0 ? waiting : waiting.pipe(Effect.timeoutFail({
+		return remaining === void 0 ? waiting : waiting.pipe(Effect.timeoutOrElse({
 			duration: Math.min(remaining, 2147483647),
-			onTimeout: () => new ModelChangeBoundaryDeadlineError("Run admission deadline has passed")
+			orElse: () => Effect.fail(new ModelChangeBoundaryDeadlineError("Run admission deadline has passed"))
 		}));
 	});
 	const fence = () => {
@@ -2618,7 +2617,7 @@ function createRunAdmission(options) {
 	};
 	const whenDrained = () => Effect.suspend(() => {
 		if (active === 0) return Effect.void;
-		return Effect.async((resume) => {
+		return Effect.callback((resume) => {
 			let settled = false;
 			let waiter;
 			const cleanup = () => {
@@ -2736,7 +2735,7 @@ function createInMemoryAgentMemoryRepository(options = {}) {
 		bucket.set(restored.id, restored);
 		records.set(namespace, bucket);
 	}
-	const serial = Effect.unsafeMakeSemaphore(1);
+	const serial = Semaphore.makeUnsafe(1);
 	return {
 		get: (binding, id) => Effect.sync(() => records.get(createMemoryNamespace(binding))?.get(id)),
 		list: (binding) => Effect.sync(() => [...records.get(createMemoryNamespace(binding))?.values() ?? []]),
@@ -3182,7 +3181,7 @@ function createToolOperationLedger(options = {}) {
 		if (records.has(operation.operationId)) throw new ToolOperationLedgerError(`duplicate initial tool operation: ${operation.operationId}`);
 		records.set(operation.operationId, operation);
 	}
-	const semaphore = Effect.unsafeMakeSemaphore(1);
+	const semaphore = Semaphore.makeUnsafe(1);
 	const exclusive = (effect) => semaphore.withPermits(1)(Effect.uninterruptible(effect));
 	const save = (operation) => {
 		const snapshot = operation.toSnapshot();
@@ -3338,9 +3337,9 @@ function createToolBroker(options) {
 			})).execute(request.input, context);
 			if (request.operationId) yield* operations.complete(request.operationId, binding, result);
 			return result;
-		}).pipe(Effect.catchAll((error) => {
+		}).pipe(Effect.catch((error) => {
 			if (!request.operationId) return Effect.fail(error);
-			return (prepared.tool.risk === "observe" || error instanceof ToolExecutorInputRejected ? operations.abort(request.operationId, binding) : operations.requireReconciliation(request.operationId, binding, error instanceof Error ? error.message : String(error))).pipe(Effect.zipRight(Effect.fail(error)));
+			return (prepared.tool.risk === "observe" || error instanceof ToolExecutorInputRejected ? operations.abort(request.operationId, binding) : operations.requireReconciliation(request.operationId, binding, error instanceof Error ? error.message : String(error))).pipe(Effect.andThen(Effect.fail(error)));
 		}));
 	}) };
 }

package/dist/pi.js

@@ -312,7 +312,7 @@ function createPiAgentLoop(options) {
 		run: (input) => {
 			const stream = Stream.fromAsyncIterable(runPiSession(input, options), (error) => error);
 			if (!options.runBoundary) return stream;
-			return Stream.unwrapScoped(Effect.acquireRelease(options.runBoundary.acquireRun({ signal: input.abortSignal }), (lease) => Effect.sync(lease.release)).pipe(Effect.as(stream)));
+			return Stream.unwrap(Effect.acquireRelease(options.runBoundary.acquireRun({ signal: input.abortSignal }), (lease) => Effect.sync(lease.release)).pipe(Effect.as(stream)));
 		}
 	};
 }
@@ -1108,13 +1108,13 @@ function streamPaidProbeCall(options) {
 					});
 				},
 				catch: (error) => error
-			}).pipe(Effect.catchAll((error) => {
+			}).pipe(Effect.catch((error) => {
 				const deadlineExceeded = callSignal.isDeadlineExceeded() || error instanceof PiModelCallDeadlineExceeded;
 				const probeError = new PiModelProbeError(deadlineExceeded ? `${options.description} stream exceeded the model change deadline` : `${options.description} stream failed: ${error instanceof Error ? error.message : String(error)}`, "unknown", { cause: error }, deadlineExceeded ? "model_change_deadline_exceeded" : "model_change_probe_failed");
 				return settle({
 					outcome: "unknown",
 					outputTokens: reservation.maxOutputTokens
-				}).pipe(Effect.zipRight(Effect.fail(probeError)));
+				}).pipe(Effect.andThen(Effect.fail(probeError)));
 			}));
 			const outputTokens = readOutputTokens(message.usage);
 			yield* settle({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rivus/runtime",
-  "version": "0.17.0",
+  "version": "0.18.1",
   "description": "Execution core, Pi/ACP adapters, memory, and tool brokerage for Rivus.",
   "type": "module",
   "license": "GPL-3.0-only",
@@ -40,9 +40,9 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@rivus/platform": "0.17.0",
+    "@rivus/platform": "0.18.1",
     "@earendil-works/pi-coding-agent": "0.84.4",
-    "effect": "^3.22.2",
+    "effect": "^4.0.0",
     "typebox": "^1.3.34",
     "@opentelemetry/api": "^1.9.1",
     "@opentelemetry/exporter-trace-otlp-proto": "^0.222.0",