@rivus/gateway 0.17.0 → 0.18.1

package/dist/chunks/rivus-node-entrypoint.js

@@ -6,7 +6,7 @@ import { RIVUS_MEMORY_TOOL_PLUGIN_ID, RIVUS_RUNTIME_TOOL_IDS, createRivusMemoryT
 import { homedir } from "node:os";
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { Cause, Effect, Either, Exit } from "effect";
+import { Cause, Deferred, Effect, Exit, Result, Semaphore } from "effect";
 import { lstat, mkdir, open, readFile, readdir, realpath, rmdir, stat, unlink, writeFile } from "node:fs/promises";
 import { randomUUID } from "node:crypto";
 import { assertPathWithin, isPathWithin } from "@rivus/platform/filesystem";
@@ -540,7 +540,7 @@ function checkManifest$1(home) {
 			},
 			manifest
 		};
-	}), Effect.catchAll((error) => Effect.succeed({ check: {
+	}), Effect.catch((error) => Effect.succeed({ check: {
 		message: `deployment manifest is invalid: ${formatError(error)}`,
 		name: "manifest",
 		status: "fail"
@@ -556,16 +556,16 @@ function checkModules(home, manifest, resolveModule, resolvePluginModule) {
 	return Effect.gen(function* () {
 		const missing = [];
 		for (const specifier of specifiers) {
-			const result = yield* toEffect(() => resolveModule(specifier)).pipe(Effect.either);
-			if (result._tag === "Left") missing.push(`${specifier} (${formatError(result.left)})`);
+			const result = yield* toEffect(() => resolveModule(specifier)).pipe(Effect.result);
+			if (result._tag === "Failure") missing.push(`${specifier} (${formatError(result.failure)})`);
 		}
 		for (const plugin of manifest.plugins) {
 			const result = yield* toEffect(() => resolvePluginModule({
 				deploymentRoot: home.directory,
 				module: plugin.module,
 				pluginId: plugin.id
-			})).pipe(Effect.either);
-			if (result._tag === "Left") missing.push(`${plugin.module} (${formatError(result.left)})`);
+			})).pipe(Effect.result);
+			if (result._tag === "Failure") missing.push(`${plugin.module} (${formatError(result.failure)})`);
 		}
 		return missing.length === 0 ? {
 			message: "Bootstrap, Plugin, Pi, and Feishu modules resolve from the global installation",
@@ -609,7 +609,7 @@ function checkCredentials$1(home, manifest, env, envFilePath) {
 			};
 		},
 		catch: toError$2
-	}).pipe(Effect.catchAll((error) => Effect.succeed({
+	}).pipe(Effect.catch((error) => Effect.succeed({
 		message: `enabled Endpoint credentials are incomplete: ${formatError(error)}`,
 		name: "credentials",
 		status: "fail"
@@ -700,16 +700,16 @@ function asError$1(error) {
 function diagnoseRivusHome(input, options) {
 	return Effect.gen(function* () {
 		const checks = [checkNode$1(input.nodeVersion)];
-		const loaded = yield* options.load(input.directory).pipe(Effect.either);
-		if (Either.isLeft(loaded)) {
+		const loaded = yield* options.load(input.directory).pipe(Effect.result);
+		if (Result.isFailure(loaded)) {
 			checks.push({
-				message: `Rivus Home is invalid: ${loaded.left.message}`,
+				message: `Rivus Home is invalid: ${loaded.failure.message}`,
 				name: "home",
 				status: "fail"
 			}, blockedCheck("workspace", "Workspace"), blockedCheck("manifest", "manifest"), blockedCheck("modules", "modules"), blockedCheck("credentials", "credentials"));
 			return report(input.directory, checks);
 		}
-		const home = loaded.right;
+		const home = loaded.success;
 		checks.push({
 			message: "config.json is valid and contained in Rivus Home",
 			name: "home",
@@ -1219,8 +1219,8 @@ function checkManifest(directory) {
 				deploymentRoot: directory,
 				module: plugin.module,
 				pluginId: plugin.id
-			}).pipe(Effect.either);
-			if (Either.isLeft(result)) missingModules.push(plugin.module);
+			}).pipe(Effect.result);
+			if (Result.isFailure(result)) missingModules.push(plugin.module);
 		}
 		if (missingModules.length > 0) return { check: {
 			message: `manifest Plugin modules are missing: ${missingModules.join(", ")}`,
@@ -1235,7 +1235,7 @@ function checkManifest(directory) {
 			},
 			manifest
 		};
-	})), Effect.catchAll((error) => Effect.succeed({ check: {
+	})), Effect.catch((error) => Effect.succeed({ check: {
 		message: `deployment manifest is invalid: ${error.message}`,
 		name: "manifest",
 		status: "fail"
@@ -2869,7 +2869,7 @@ const DEFAULT_RUNTIME_DISPOSE_TIMEOUT_MS = 1e4;
 function createEffectRuntimePool(options) {
 	const runtimes = createRuntimeCache();
 	const active = /* @__PURE__ */ new Map();
-	const lifecycle = Effect.unsafeMakeSemaphore(1);
+	const lifecycle = Semaphore.makeUnsafe(1);
 	const existingRuntime = (instance) => Effect.gen(function* () {
 		const selected = yield* runtimes.getExisting(instance.instanceId);
 		if (!selected || !(yield* runtimes.isCurrent(instance.instanceId, selected.entry))) return;
@@ -3121,10 +3121,10 @@ function resolveRivusDeployment(input) {
 					return plugin;
 				},
 				catch: toDeploymentFailure
-			})), Effect.either);
-			if (Either.isLeft(loaded)) {
-				const message = formatDeploymentFailure(loaded.left);
-				if (declaration.required) return yield* Effect.fail(new RivusPluginLoadError(declaration.id, declaration.module, `required plugin ${declaration.id} failed to load: ${message}`, { cause: loaded.left }));
+			})), Effect.result);
+			if (Result.isFailure(loaded)) {
+				const message = formatDeploymentFailure(loaded.failure);
+				if (declaration.required) return yield* Effect.fail(new RivusPluginLoadError(declaration.id, declaration.module, `required plugin ${declaration.id} failed to load: ${message}`, { cause: loaded.failure }));
 				const status = Object.freeze({
 					error: message,
 					id: declaration.id,
@@ -3141,7 +3141,7 @@ function resolveRivusDeployment(input) {
 				module: declaration.module,
 				required: declaration.required,
 				status: "loaded",
-				version: loaded.right.manifest.version
+				version: loaded.success.manifest.version
 			});
 			pluginStatuses.push(status);
 			statusByPlugin.set(declaration.id, status);
@@ -3175,23 +3175,23 @@ function resolveRivusDeployment(input) {
 					}) : baseDefinition;
 				},
 				catch: toDeploymentFailure
-			}).pipe(Effect.either);
-			if (Either.isLeft(resolved)) {
+			}).pipe(Effect.result);
+			if (Result.isFailure(resolved)) {
 				const declaration = input.manifest.plugins.find(({ id }) => id === agent.pluginId);
-				if (declaration.required) return yield* Effect.fail(new RivusPluginLoadError(declaration.id, declaration.module, `deployment ${agent.agentId} failed to resolve: ${resolved.left.message}`, { cause: resolved.left }));
+				if (declaration.required) return yield* Effect.fail(new RivusPluginLoadError(declaration.id, declaration.module, `deployment ${agent.agentId} failed to resolve: ${resolved.failure.message}`, { cause: resolved.failure }));
 				agentStatuses.push(Object.freeze({
 					agentId: agent.agentId,
 					pluginId: agent.pluginId,
 					profileId: agent.profileId,
-					reason: resolved.left.message,
+					reason: resolved.failure.message,
 					status: "disabled"
 				}));
 				continue;
 			}
-			definitions.push(resolved.right);
+			definitions.push(resolved.success);
 			agentStatuses.push(Object.freeze({
 				agentId: agent.agentId,
-				definition: resolved.right,
+				definition: resolved.success,
 				pluginId: agent.pluginId,
 				profileId: agent.profileId,
 				status: "enabled"
@@ -3841,13 +3841,20 @@ async function createRivusDeploymentCliProcess(factory, context) {
 				deployment,
 				digest: createSha256Digest
 			})));
-		})).pipe(Effect.flatMap((control) => Effect.gen(function* () {
-			const [cached, invalidate] = yield* Effect.cachedInvalidateWithTTL(Effect.suspend(() => adapters.createRecoveryControl ? adapters.createRecoveryControl() : Effect.fail(/* @__PURE__ */ new Error("Deployment bootstrap does not expose Recovery Control"))), Infinity);
+		})).pipe(Effect.map((control) => {
+			let opening;
 			return {
 				control,
-				openRecovery: cached.pipe(Effect.onExit((exit) => Exit.isFailure(exit) && !Cause.isInterruptedOnly(exit.cause) ? invalidate : Effect.void))
+				openRecovery: Effect.uninterruptible(Effect.suspend(() => {
+					if (opening) return Deferred.await(opening);
+					const current = Deferred.makeUnsafe();
+					opening = current;
+					return Effect.suspend(() => adapters.createRecoveryControl ? adapters.createRecoveryControl() : Effect.fail(/* @__PURE__ */ new Error("Deployment bootstrap does not expose Recovery Control"))).pipe(Effect.onExit((exit) => Effect.sync(() => {
+						if (Exit.isFailure(exit) && opening === current) opening = void 0;
+					}).pipe(Effect.andThen(Deferred.done(current, exit)))));
+				}))
 			};
-		})))));
+		}))));
 		daemon = constructed.control;
 		openRecovery = constructed.openRecovery;
 	} catch (constructionError) {
@@ -3864,7 +3871,7 @@ async function createRivusDeploymentCliProcess(factory, context) {
 	}))]).pipe(Effect.map((exits) => exits.filter(Exit.isFailure).map((exit) => Cause.squash(exit.cause))));
 	const startDeployment = Effect.uninterruptible(Effect.suspend(() => {
 		if (adaptersDisposed) return Effect.fail(/* @__PURE__ */ new Error("Rivus deployment process cannot restart after its adapters have been disposed"));
-		return Effect.suspend(() => daemon.start()).pipe(Effect.catchAllCause((cause) => {
+		return Effect.suspend(() => daemon.start()).pipe(Effect.catchCause((cause) => {
 			const startError = Cause.squash(cause);
 			return cleanupErrors.pipe(Effect.flatMap((errors) => Effect.fail(errors.length > 0 ? new AggregateError([startError, ...errors], "deployment startup and cleanup failed") : startError)));
 		}));
@@ -3893,7 +3900,7 @@ async function createRivusDeploymentCliProcess(factory, context) {
 				sessionKey: command.sessionKey,
 				text: command.text
 			}).pipe(Effect.map(readPromptFinalText));
-		}).pipe(Effect.catchAllCause((cause) => Effect.fail(Cause.squash(cause))))
+		}).pipe(Effect.catchCause((cause) => Effect.fail(Cause.squash(cause))))
 	};
 	const replayReceiveMessage = adapters.replayReceiveMessage;
 	if (replayReceiveMessage) process.replayReceiveMessage = (payload, options) => Effect.suspend(() => daemon.running() ? Effect.void : startDeployment).pipe(Effect.flatMap(() => replayReceiveMessage((input) => daemon.handleDefault(input), payload, options)));
@@ -4069,7 +4076,7 @@ function runRivusDaemonCli(options) {
 		yield* daemon.start();
 		options.stdout.write(RIVUS_DAEMON_STARTED_MESSAGE);
 		return 0;
-	}).pipe(Effect.catchAll((error) => Effect.sync(() => {
+	}).pipe(Effect.catch((error) => Effect.sync(() => {
 		options.stderr.write(formatRivusDaemonLine(formatRivusDaemonError(error)));
 		return 1;
 	})));
@@ -4189,7 +4196,7 @@ function runModelCommand(options) {
 	return Effect.tryPromise({
 		try: () => client.execute(parsed),
 		catch: (error) => error
-	}).pipe(Effect.tap((response) => Effect.sync(() => writeModelResponse(options.stdout, response))), Effect.map((response) => modelManagementExitCode(response)), Effect.catchAll((error) => Effect.sync(() => {
+	}).pipe(Effect.tap((response) => Effect.sync(() => writeModelResponse(options.stdout, response))), Effect.map((response) => modelManagementExitCode(response)), Effect.catch((error) => Effect.sync(() => {
 		writeModelResponse(options.stdout, modelTransportFailure(error));
 		return 1;
 	})));
@@ -4217,7 +4224,7 @@ function modelTransportFailure(error) {
 	};
 }
 function runSetupCommand(options) {
-	return withOptionalDirectoryArgument(options, "setup", (argument) => resolveHomeDirectoryEffect(options, argument).pipe(Effect.flatMap((directory) => options.homeApi.setup(directory).pipe(Effect.tap(() => Effect.sync(() => options.stdout.write(renderRivusSetupSuccess(directory)))), Effect.as(0))), Effect.catchAll((error) => writeError(options, error))));
+	return withOptionalDirectoryArgument(options, "setup", (argument) => resolveHomeDirectoryEffect(options, argument).pipe(Effect.flatMap((directory) => options.homeApi.setup(directory).pipe(Effect.tap(() => Effect.sync(() => options.stdout.write(renderRivusSetupSuccess(directory)))), Effect.as(0))), Effect.catch((error) => writeError(options, error))));
 }
 function runHomeDaemonCommand(options, command, daemonArgs) {
 	if (hasRivusHomeCommandArguments(options.argv.slice(1))) return Effect.sync(() => {
@@ -4241,7 +4248,7 @@ function runHomeDaemonCommand(options, command, daemonArgs) {
 			RIVUS_HOME: home.directory
 		},
 		pluginPackageManifestPath: options.pluginPackageManifestPath ?? gatewayPackageManifestPath
-	})), Effect.catchAll((error) => writeError(options, error)));
+	})), Effect.catch((error) => writeError(options, error)));
 }
 function runInitCommand(options) {
 	return withOptionalDirectoryArgument(options, "init", (argument) => {
@@ -4253,7 +4260,7 @@ function runInitCommand(options) {
 				templateDirectory: gatewayTemplateDirectory
 			}),
 			catch: (error) => error
-		}).pipe(Effect.tap((result) => Effect.sync(() => options.stdout.write(renderRivusProjectInitializationSuccess(result.directory)))), Effect.as(0), Effect.catchAll((error) => writeError(options, error)));
+		}).pipe(Effect.tap((result) => Effect.sync(() => options.stdout.write(renderRivusProjectInitializationSuccess(result.directory)))), Effect.as(0), Effect.catch((error) => writeError(options, error)));
 	});
 }
 function withOptionalDirectoryArgument(options, command, run) {
@@ -4286,14 +4293,14 @@ function runDoctorCommand(options) {
 		env: options.env,
 		...parsed.envFilePath ? { envFilePath: parsed.envFilePath } : {},
 		nodeVersion: options.nodeVersion
-	})), Effect.map((report) => writeDoctorReport(options.stdout, report, "Home")), Effect.catchAll((error) => writeError(options, error)));
+	})), Effect.map((report) => writeDoctorReport(options.stdout, report, "Home")), Effect.catch((error) => writeError(options, error)));
 	const projectDirectory = parsed.directory;
 	return diagnoseRivusProject({
 		directory: resolve(options.cwd, projectDirectory),
 		env: options.env,
 		...parsed.envFilePath ? { envFilePath: parsed.envFilePath } : {},
 		nodeVersion: options.nodeVersion
-	}).pipe(Effect.map((report) => writeDoctorReport(options.stdout, report, "project")), Effect.catchAll((error) => writeError(options, error)));
+	}).pipe(Effect.map((report) => writeDoctorReport(options.stdout, report, "project")), Effect.catch((error) => writeError(options, error)));
 }
 function resolveHomeDirectoryEffect(options, argument) {
 	return Effect.try({

package/dist/chunks/runtime-cache.js

@@ -1,7 +1,7 @@
 import { isRivusRuntimeToolId } from "@rivus/runtime";
 import { dirname, isAbsolute } from "node:path";
 import { fileURLToPath } from "node:url";
-import { Cause, Deferred, Effect, Exit } from "effect";
+import { Cause, Deferred, Effect, Exit, Semaphore } from "effect";
 import { chmod, mkdir, open, readFile, rename, stat, unlink } from "node:fs/promises";
 import { randomUUID } from "node:crypto";
 import { createConnection, createServer } from "node:net";
@@ -1199,18 +1199,18 @@ function parseLockOwner(value) {
 //#endregion
 //#region src/platform/project/setup/release-descriptor.ts
 const RIVUS_RELEASE_DESCRIPTOR = Object.freeze({
-	version: "0.17.0",
+	version: "0.18.1",
 	dependencies: Object.freeze({
 		"@earendil-works/pi-coding-agent": "0.84.4",
 		"@larksuiteoapi/node-sdk": "1.74.0",
-		effect: "^3.22.2"
+		effect: "^4.0.0"
 	})
 });
 //#endregion
 //#region src/platform/runtime-pool/runtime-cache.ts
 function createRuntimeCache() {
 	const entries = /* @__PURE__ */ new Map();
-	const serial = Effect.unsafeMakeSemaphore(1);
+	const serial = Semaphore.makeUnsafe(1);
 	const reserve = (key) => serial.withPermits(1)(Effect.gen(function* () {
 		const current = entries.get(key);
 		if (current) return {
@@ -1237,7 +1237,7 @@ function createRuntimeCache() {
 		const initialization = create().pipe(Effect.tapError(() => serial.withPermits(1)(Effect.sync(() => {
 			if (entries.get(entry.key) === entry) entries.delete(entry.key);
 		}))), Effect.exit, Effect.flatMap((exit) => Deferred.done(entry.deferred, exit)), Effect.asVoid);
-		yield* Effect.forkDaemon(initialization);
+		yield* Effect.forkDetach(initialization, { uninterruptible: "inherit" });
 	}));
 	const getOrCreate = (key, create) => Effect.uninterruptibleMask((restore) => Effect.gen(function* () {
 		const selected = yield* reserve(key);
@@ -1272,15 +1272,16 @@ function disposeRuntimeCacheEntries(options) {
 	const disposal = Effect.gen(function* () {
 		const completions = yield* Effect.forEach(options.entries, (entry) => Effect.gen(function* () {
 			const completion = yield* Deferred.make();
-			yield* Effect.forkDaemon(Deferred.await(entry.deferred).pipe(Effect.flatMap(options.dispose), Effect.exit, Effect.flatMap((exit) => Deferred.succeed(completion, exit)), Effect.asVoid));
+			yield* Effect.forkDetach(Deferred.await(entry.deferred).pipe(Effect.flatMap(options.dispose), Effect.exit, Effect.flatMap((exit) => Deferred.succeed(completion, exit)), Effect.asVoid), { uninterruptible: "inherit" });
 			return completion;
 		}), { concurrency: "unbounded" });
 		const failures = (yield* Effect.forEach(completions, Deferred.await, { concurrency: "unbounded" })).filter(Exit.isFailure).map(({ cause }) => Cause.squash(cause));
 		if (failures.length > 0) return yield* Effect.fail(new AggregateError(failures, options.failureMessage));
 	});
-	return options.timeout ? disposal.pipe(Effect.timeoutFail({
-		duration: options.timeout.milliseconds,
-		onTimeout: options.timeout.onTimeout
+	const timeout = options.timeout;
+	return timeout ? disposal.pipe(Effect.timeoutOrElse({
+		duration: timeout.milliseconds,
+		orElse: () => Effect.fail(timeout.onTimeout())
 	})) : disposal;
 }
 function invokeRuntimeControl(runtime, control) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rivus/gateway",
-  "version": "0.17.0",
+  "version": "0.18.1",
   "description": "Message gateway, channels, host binding, automation, and daemon assembly for Rivus.",
   "type": "module",
   "license": "GPL-3.0-only",
@@ -52,11 +52,12 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@rivus/platform": "0.17.0",
-    "@rivus/runtime": "0.17.0",
+    "@rivus/platform": "0.18.1",
+    "@rivus/runtime": "0.18.1",
     "@larksuiteoapi/node-sdk": "1.74.0",
     "axios": "1.20.0",
-    "effect": "^3.22.2",
+    "effect": "^4.0.0",
+    "get-east-asian-width": "1.6.0",
     "marked": "18.0.14",
     "@resvg/resvg-js": "2.6.2"
   },