@graftland/plugin-remote 0.3.1 → 0.3.3

package/dist/{entry-B89sepMU.js → entry-psOpX3Bj.js}

@@ -1,23 +1,22 @@
-import { c as isPlugin, i as plugin, l as make, o as fork, t as forks, u as optional } from "./Graft-CVyueNOf.js";
+import { c as isPlugin, i as plugin, l as make, o as fork, t as forks, u as optional } from "./Graft-B71CPA2Y.js";
 import { t as ConfigDirectory } from "./ConfigDirectory-BCC6q2R4.js";
-import { i as make$2, m as isSubtreeActive, n as ModuleInvalid, o as CurrentId, p as findSubtree, r as ModuleResolver, t as make$1 } from "./importer-Bk6U_sn4.js";
-import { c as endpoint, n as UndeclaredFailure, o as endpoints, r as fromModule } from "./Contract-DL2mHvaT.js";
-import { a as ProcessExited, c as RemoteWithdrawn, i as MissingInstance, l as TransportError, o as RemoteEntryError, r as LocalTerminationTimeout, s as RemoteError, t as AuthenticationFailed } from "./Errors-BMKmu5Y7.js";
+import { i as make$2, m as isSubtreeActive, n as ModuleInvalid, o as CurrentId, p as findSubtree, r as ModuleResolver, t as make$1 } from "./importer-Cvf88eAY.js";
+import { c as endpoint, n as UndeclaredFailure, o as endpoints, r as fromModule } from "./Contract-DsJtisvL.js";
+import { a as MissingInstance, c as RemoteError, i as LocalTerminationTimeout, l as RemoteWithdrawn, o as ProcessExited, r as CredentialsError, s as RemoteEntryError, t as AuthenticationFailed, u as TransportError } from "./Errors-DYhsGZcZ.js";
 import { n as WorkerTransport, t as LocalTransport } from "./directTransport-DrexuPSm.js";
-import { a as PositiveDuration, i as Supervisor, n as resolveEntry, r as verify } from "./Packages-JNL34JpS.js";
-import { E as make$3, b as awaitTermination, n as Session, r as channel, t as Peer, x as childOf } from "./Peer-BT7eAGmh.js";
+import { a as PositiveDuration, i as Supervisor, n as resolveEntry, r as verify } from "./Packages-AgoCGotL.js";
+import { E as make$3, _ as StateStorageError, a as ExecutionError, b as awaitTermination, c as PackageError, d as SessionAccessDenied, f as SessionConflict, g as StateDirectoryLocked, h as StaleSession, l as RemoteTerminationUnconfirmed, m as SessionStopped, n as Session, r as channel, s as LeaseExpired, t as Peer, u as RunnerClosing, x as childOf, y as TerminationUnconfirmed } from "./Peer-DXeVrGBh.js";
 import { n as Credentials, t as Authenticator } from "./Auth-BElTC9_X.js";
 import { n as Listener, t as Connector } from "./Transport-DULzpsgR.js";
-import { n as connectionEnded, r as prepare, t as closedNormally } from "./connectionEnded-DCpFCjMX.js";
-import { t as ServeLifecycle } from "./ServeLifecycle-CJM0gG5B.js";
-import { t as make$4 } from "./FailureGroup-BcH0XOBi.js";
-import { n as cleanupCause, t as children } from "./cleanup-CXLa1Wd9.js";
-import { n as make$5, o as defaults } from "./port-DSVUY8Bq.js";
-import { n as close } from "./release-BY4Mlluy.js";
-import { n as stdinExitTimeout } from "./ProcessObservation-DEGrEMfP.js";
-import { Array, Cause, Context, Deferred, Duration, Effect, Exit, Fiber, Option, Path, Ref, References, Schema, Scope, Stream, String } from "effect";
+import { a as AlreadyLoaded, i as ActivationFailed, n as connectionEnded, o as ContractNotFound, r as prepare, s as ModuleImportFailed, t as closedNormally } from "./connectionEnded-BwcxQ7W8.js";
+import { t as ServeLifecycle } from "./ServeLifecycle-Bd1FPJ6e.js";
+import { n as children, r as cleanupCause, t as make$4 } from "./FailureGroup-BgT73AaR.js";
+import { n as make$5, o as defaults } from "./port--3x2zJ4D.js";
+import { n as close, t as ReleaseInterrupted } from "./release-DfZPuIcK.js";
+import { n as stdinExitTimeout } from "./ProcessObservation-gLgGirYv.js";
+import { Array, Cause, Context, Deferred, Duration, Effect, Exit, Fiber, Option, Path, PlatformError, Ref, References, Schema, Scope, Stream, String } from "effect";
 import { SecureRandom } from "effect/crypto";
-import { RpcClient } from "effect/rpc";
+import { RpcClient, RpcClientError } from "effect/rpc";
 import { ChildProcessSpawner } from "effect/process";
 // packages/remote/src/internal/entryConfig.ts
 const Reference = Schema.Struct({
@@ -216,6 +215,13 @@ var CapabilityCombinationError = class extends Schema.TaggedError()("CapabilityC
 	}
 };
 var CapabilityFailed = class extends Schema.TaggedError()("CapabilityFailed", { cause: Schema.Cause(Schema.Unknown, Schema.Unknown) }) {};
+/** Every failure class assembly raises; host error classification reads this list. */
+const errors = [
+	ListenerConfigError,
+	CapabilityContractError,
+	CapabilityCombinationError,
+	CapabilityFailed
+];
 const definition = Schema.declare(isPlugin);
 /** Entries resolve capability modules before assembling their private providers. */
 const Invocation = Schema.Struct({
@@ -281,7 +287,7 @@ const compatible = (properties, kind) => {
 const kind = (auth) => auth._tag === "Mtls" ? "Certificate" : auth._tag === "Header" ? "Authorization" : "None";
 const warn = (properties, credentials, side) => Effect.all([properties.network && !properties.encrypted ? Effect.logWarning(credentials === "Authorization" ? `${properties.protocol}:// ${side === "host" ? "connection" : "listener"} is unencrypted; credentials are transmitted in plaintext` : `${properties.protocol}:// ${side === "host" ? "connection" : "listener"} is unencrypted`) : Effect.void, side === "runner" && properties.network && credentials === "None" ? Effect.logWarning("WebSocket listener has no authentication") : Effect.void], { discard: true });
 const directAuth = (properties, explicit) => explicit && (properties.protocol === "stdio" || properties.protocol === "command") ? Effect.fail(CapabilityCombinationError.make({ detail: `${properties.protocol} transports do not accept auth` })) : Effect.void;
-const connectWith = (explicitAuth = false) => Effect.gen(function* () {
+const connectWith = Effect.fnUntraced(function* (explicitAuth = false) {
 	const connector = yield* Connector;
 	const credentials = yield* Credentials;
 	yield* directAuth(connector.properties, explicitAuth);
@@ -321,7 +327,7 @@ const makeListenerConsumer = (prepare = () => Effect.void, ready = Effect.void)
 const listenerConsumer = makeListenerConsumer();
 connectWith();
 // packages/remote/src/internal/host/runner.ts
-const connect$1 = (target, contractModule, options, resources, processScope) => Effect.gen(function* () {
+const connect$1 = Effect.fnUntraced(function* (target, contractModule, options, resources, processScope) {
 	const instance = target.instance;
 	const margin = Duration.toMillis(target.margin ?? "5 seconds");
 	const channel$1 = yield* connectWith(target.explicitAuth).pipe(Scope.provide(processScope));
@@ -344,7 +350,7 @@ const connect$1 = (target, contractModule, options, resources, processScope) =>
 	const finishStarted = yield* Ref.make(false);
 	const terminate = yield* Effect.cached(Effect.gen(function* () {
 		yield* Ref.set(finishStarted, true);
-		yield* failures.close;
+		const closed = yield* Effect.exit(failures.close);
 		const result = yield* awaitTermination(record.handle, session.Dispose(record.handle), record.leaseMillis, margin);
 		const { code, signal, stderr, cause } = result.exit;
 		yield* Effect.logInfo("Remote execution terminated", {
@@ -357,7 +363,8 @@ const connect$1 = (target, contractModule, options, resources, processScope) =>
 			"remote.generation": record.handle.generation,
 			"remote.termination": result.kind
 		}));
-		if (result.cause.reasons.length > 0) return yield* Effect.failCause(cleanupCause(result.cause));
+		const failure = Exit.isFailure(closed) ? Cause.combine(closed.cause, result.cause) : result.cause;
+		if (failure.reasons.length > 0) return yield* Effect.failCause(cleanupCause(failure));
 	}));
 	yield* Scope.addFinalizer(processScope, Effect.gen(function* () {
 		if (!(yield* Ref.get(finishStarted))) yield* terminate.pipe(Effect.catchCause((cause) => Effect.failCause(cleanupCause(cause))));
@@ -377,7 +384,7 @@ const connect$1 = (target, contractModule, options, resources, processScope) =>
 	}).pipe(Scope.provide(resources));
 	const report = (cause) => Cause.hasInterruptsOnly(cause) ? Effect.void : failures.failCause(Cause.map(cause, (error) => TransportError.make({ cause: Cause.fail(error) })));
 	yield* failures.await.pipe(Effect.catchCause((cause) => Cause.hasInterruptsOnly(cause) ? Effect.void : peer.fail(TransportError.make({ cause }))), Effect.forkIn(resources));
-	yield* failures.run(Fiber.join(renewed).pipe(Effect.catchCause((cause) => Effect.gen(function* () {
+	yield* failures.run(Fiber.join(renewed).pipe(Effect.catchCause(Effect.fnUntraced(function* (cause) {
 		if (Cause.hasInterruptsOnly(cause)) return;
 		const status = yield* Effect.exit(session.Status(record.handle).pipe(Effect.timeout("5 seconds")));
 		if (Exit.isSuccess(status) && status.value.phase === "Stopped") {
@@ -394,7 +401,7 @@ const connect$1 = (target, contractModule, options, resources, processScope) =>
 		resources,
 		pid: Option.map(childOf(loaded), (child) => child.pid),
 		diagnostics: failures.cause,
-		terminate: () => Effect.gen(function* () {
+		terminate: Effect.fnUntraced(function* () {
 			yield* Fiber.interrupt(renewed);
 			yield* terminate;
 		}),
@@ -426,7 +433,7 @@ const connect = Effect.fnUntraced(function* (execution, options) {
 			report
 		},
 		diagnostics: Fiber.await(exited).pipe(Effect.andThen(failures.cause)),
-		terminate: (graceful) => Effect.gen(function* () {
+		terminate: Effect.fnUntraced(function* (graceful) {
 			yield* failures.close;
 			if (!graceful) return;
 			const status = yield* peer.end.pipe(Effect.catchCauseIf(Cause.hasInterruptsOnly, () => Effect.void), Effect.andThen(Fiber.join(exited)), Effect.interruptible, Effect.timeoutOrElse({
@@ -463,17 +470,17 @@ const finish = (causes) => {
 const scopes = Effect.acquireRelease(Effect.all({
 	resources: Scope.make(),
 	process: Scope.make()
-}), (scopes, exit) => Effect.gen(function* () {
+}), Effect.fnUntraced(function* (scopes, exit) {
 	const process = yield* Effect.exit(close(scopes.process, exit));
 	const resources = yield* Effect.exit(close(scopes.resources, exit));
 	yield* finish([reason(process), reason(resources)]);
 }));
 /** Setup supplies a concrete control lifecycle; release never reads a later-installed effect. */
-const acquire = (target, contractModule, options, setup, dispose, timeout) => Effect.gen(function* () {
+const acquire = Effect.fnUntraced(function* (target, contractModule, options, setup, dispose, timeout) {
 	const owned = yield* scopes;
 	const connection = yield* Effect.acquireRelease(Effect.gen(function* () {
 		return target._tag === "Local" || target._tag === "Worker" ? yield* Local(target, contractModule, options, owned.resources, owned.process).pipe(Effect.map(connected)) : yield* connect$1(target, contractModule, options, owned.resources, owned.process);
-	}).pipe(Effect.interruptible), (connection, exit) => Effect.gen(function* () {
+	}).pipe(Effect.interruptible), Effect.fnUntraced(function* (connection, exit) {
 		const process = yield* Effect.exit(close(owned.process, exit));
 		yield* connection.diagnostics;
 		const resources = yield* Effect.exit(close(owned.resources, exit));
@@ -484,7 +491,7 @@ const acquire = (target, contractModule, options, setup, dispose, timeout) => Ef
 			diagnostics
 		]);
 	}));
-	return yield* Effect.acquireRelease(setup.pipe(Effect.provideService(Connection, connection)), (value) => Effect.gen(function* () {
+	return yield* Effect.acquireRelease(setup.pipe(Effect.provideService(Connection, connection)), Effect.fnUntraced(function* (value) {
 		const graceful = yield* dispose(value).pipe(Effect.interruptible, Effect.timeout(timeout), Effect.exit);
 		const terminated = yield* Effect.exit(connection.terminate(Exit.isSuccess(graceful)));
 		yield* finish([Exit.isSuccess(graceful) ? graceful.value : graceful.cause, reason(terminated)]);
@@ -492,7 +499,7 @@ const acquire = (target, contractModule, options, setup, dispose, timeout) => Ef
 });
 // packages/remote/src/internal/host.ts
 const race = (connection, effect) => Effect.raceFirst(effect, connection.transport.failure);
-const forwardEvents = (contract, client, connection) => Effect.gen(function* () {
+const forwardEvents = Effect.fnUntraced(function* (contract, client, connection) {
 	const stopped = yield* Deferred.make();
 	const remoteFailure = yield* make$4();
 	return {
@@ -507,10 +514,10 @@ const forwardEvents = (contract, client, connection) => Effect.gen(function* ()
 		}))).pipe(Effect.tapCause(connection.transport.report), Effect.forkIn(connection.resources))
 	};
 });
-const forwardLogs = (contract, client, connection) => Effect.gen(function* () {
+const forwardLogs = Effect.fnUntraced(function* (contract, client, connection) {
 	const logsEnded = yield* Deferred.make();
 	const reportedDrops = yield* Ref.make(0);
-	yield* race(connection, client.Logs().pipe(Stream.runForEach((event) => Effect.gen(function* () {
+	yield* race(connection, client.Logs().pipe(Stream.runForEach(Effect.fnUntraced(function* (event) {
 		const previous = yield* Ref.getAndSet(reportedDrops, event.dropped);
 		if (event.dropped > previous) yield* Effect.logWarning("Remote logs were dropped").pipe(Effect.annotateLogs({
 			...Option.isSome(connection.pid) ? { "remote.pid": connection.pid.value } : {},
@@ -531,7 +538,7 @@ const forwardLogs = (contract, client, connection) => Effect.gen(function* () {
 	})))).pipe(Effect.tapCause(connection.transport.report), Effect.forkIn(connection.resources));
 	return logsEnded;
 });
-const initialize = (contract) => Effect.gen(function* () {
+const initialize = Effect.fnUntraced(function* (contract) {
 	const connection = yield* Connection;
 	const client = yield* RpcClient.make(contract.control).pipe(Effect.provideService(RpcClient.Protocol, connection.transport.clientProtocol(endpoint)), Scope.provide(connection.resources));
 	for (const service of contract.inject) yield* service.serve(connection.transport).pipe(Effect.tapCause(connection.transport.report), Effect.forkIn(connection.resources));
@@ -545,7 +552,7 @@ const initialize = (contract) => Effect.gen(function* () {
 	};
 });
 const load$1 = (active, input) => race(active.connection, Effect.raceFirst(active.client.Load({ input }).pipe(Effect.catchIf((cause) => Cause.isCause(cause), Effect.failCause)), active.remoteFailure.await));
-const dispose = (active) => Effect.gen(function* () {
+const dispose = Effect.fnUntraced(function* (active) {
 	const result = yield* race(active.connection, active.client.Dispose().pipe(Effect.catchIf(Cause.isCause, Effect.succeed)));
 	const cause = Cause.isCause(result) ? result : Cause.empty;
 	yield* race(active.connection, Deferred.await(active.stopped).pipe(Effect.andThen(Deferred.await(active.logsEnded)))).pipe(Effect.onError(() => Effect.failCause(cleanupCause(cause))));
@@ -562,7 +569,7 @@ const executionPlugin = (contract, options, configured, annotations = {}) => mak
 		...Array.map(contract.inject, (service) => service.key)
 	],
 	config: Schema.toEncoded(contract.config),
-	apply: (input) => Effect.gen(function* () {
+	apply: Effect.fnUntraced(function* (input) {
 		const prepared = prepare(contract);
 		const session = yield* (yield* SecureRandom.SecureRandom).uuidV4();
 		const active = yield* acquire(configured, options.contractModule, {
@@ -577,9 +584,39 @@ const executionPlugin = (contract, options, configured, annotations = {}) => mak
 		for (const service of contract.provides) yield* service.publish(active.connection.transport).pipe(Scope.provide(active.connection.resources));
 		yield* fork(Effect.raceFirst(Fiber.join(active.events), active.remoteFailure.await).pipe(Effect.mapError((error) => publicError(contract.error, error))));
 		return () => Effect.succeed(false);
-	}).pipe(Effect.annotateLogs(annotations), Effect.mapError((error) => publicError(contract.error, error)))
+	}, Effect.annotateLogs(annotations), Effect.mapError((error) => publicError(contract.error, error)))
 });
-const publicError = (declared, error) => Schema.is(declared)(error) ? error : Schema.is(UndeclaredFailure)(error) || Schema.is(RemoteWithdrawn)(error) || Schema.is(RemoteError)(error) || Schema.is(MissingInstance)(error) ? error : RemoteError.make({ cause: Cause.fail(error) });
+/** Failures raised by the host machinery; a permissive declared schema must not claim them. */
+const internalErrors = [
+	ProcessExited,
+	TransportError,
+	LocalTerminationTimeout,
+	CredentialsError,
+	AuthenticationFailed,
+	RemoteEntryError,
+	AlreadyLoaded,
+	ContractNotFound,
+	ModuleImportFailed,
+	ActivationFailed,
+	PackageError,
+	SessionAccessDenied,
+	StaleSession,
+	LeaseExpired,
+	SessionStopped,
+	SessionConflict,
+	StateStorageError,
+	ExecutionError,
+	TerminationUnconfirmed,
+	RunnerClosing,
+	StateDirectoryLocked,
+	RemoteTerminationUnconfirmed,
+	ReleaseInterrupted,
+	RpcClientError.RpcClientError,
+	...errors
+];
+const isInternal = (error) => Schema.isSchemaError(error) || PlatformError.isPlatformError(error) || Array.some(internalErrors, (Class) => error instanceof Class);
+const isPublic = (error) => Schema.is(UndeclaredFailure)(error) || Schema.is(RemoteWithdrawn)(error) || Schema.is(RemoteError)(error) || Schema.is(MissingInstance)(error);
+const publicError = (declared, error) => isPublic(error) ? error : !isInternal(error) && Schema.is(declared)(error) ? error : RemoteError.make({ cause: Cause.fail(error) });
 // packages/remote/src/internal/entry.ts
 const boundary = Effect.fnUntraced(function* (field) {
 	const entry = yield* CurrentId;
@@ -598,7 +635,7 @@ const resolve = Effect.fnUntraced(function* (reference, field) {
 	const directory = path.resolve(Option.getOrElse(source, () => "."));
 	const resolver = yield* Option.match(existing, {
 		onSome: Effect.succeed,
-		onNone: () => Effect.gen(function* () {
+		onNone: Effect.fnUntraced(function* () {
 			const importer = yield* make$1(directory);
 			return yield* make$2({
 				base: directory,

package/dist/host/auth/bearer.d.ts

@@ -1,4 +1,12 @@
 import { Config } from "../../internal/auth/tokenCredentials.js";
-declare const capability: any;
+declare const capability: import("@graftland/graft/Plugin").Definition<{
+  readonly token: import("effect/Redacted").Redacted<string> | {
+    readonly file: string;
+  };
+}, {
+  readonly token: string | {
+    readonly file: string;
+  };
+}, import("effect/Schema").SchemaError | import("@graftland/graft/Graft").ServiceConflict>;
 export { Config, capability as default };
 //# sourceMappingURL=bearer.d.ts.map

package/dist/host/auth/bearer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bearer.d.ts","names":[],"sources":["../../../src/host/auth/bearer.ts"],"mappings":";cAGM"}
+{"version":3,"file":"bearer.d.ts","names":[],"sources":["../../../src/host/auth/bearer.ts"],"mappings":";cAGM,8CAAU;;;;;;;;2BAAsC,+CAAA"}

package/dist/host/auth/bearer.js

@@ -1,4 +1,4 @@
-import { n as plugin, t as Config } from "../../tokenCredentials-CI6mMRRd.js";
+import { n as plugin, t as Config } from "../../tokenCredentials-CbCuk-Rt.js";
 // packages/remote/src/host/auth/bearer.ts
 const capability = plugin("remote-bearer-credentials");
 export { Config, capability as default };

package/dist/host/auth/jwt.d.ts

@@ -1,4 +1,12 @@
 import { Config } from "../../internal/auth/tokenCredentials.js";
-declare const capability: any;
+declare const capability: import("@graftland/graft/Plugin").Definition<{
+  readonly token: import("effect/Redacted").Redacted<string> | {
+    readonly file: string;
+  };
+}, {
+  readonly token: string | {
+    readonly file: string;
+  };
+}, import("effect/Schema").SchemaError | import("@graftland/graft/Graft").ServiceConflict>;
 export { Config, capability as default };
 //# sourceMappingURL=jwt.d.ts.map

package/dist/host/auth/jwt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jwt.d.ts","names":[],"sources":["../../../src/host/auth/jwt.ts"],"mappings":";cAGM"}
+{"version":3,"file":"jwt.d.ts","names":[],"sources":["../../../src/host/auth/jwt.ts"],"mappings":";cAGM,8CAAU;;;;;;;;2BAAmC,+CAAA"}

package/dist/host/auth/jwt.js

@@ -1,4 +1,4 @@
-import { n as plugin, t as Config } from "../../tokenCredentials-CI6mMRRd.js";
+import { n as plugin, t as Config } from "../../tokenCredentials-CbCuk-Rt.js";
 // packages/remote/src/host/auth/jwt.ts
 const capability = plugin("remote-jwt-credentials");
 export { Config, capability as default };

package/dist/host/auth/mtls.d.ts

@@ -1,8 +1,15 @@
+import { Graft, Plugin } from "@graftland/graft";
 import { Schema } from "effect";
 export declare const Config: Schema.Struct<{
   readonly cert: Schema.String;
   readonly key: Schema.String;
 }>;
-declare const _default: any;
+declare const _default: Plugin.Definition<{
+  readonly cert: string;
+  readonly key: string;
+}, {
+  readonly cert: string;
+  readonly key: string;
+}, Schema.SchemaError | Graft.ServiceConflict>;
 export { _default as default };
 //# sourceMappingURL=mtls.d.ts.map

package/dist/host/auth/mtls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mtls.d.ts","names":[],"sources":["../../../src/host/auth/mtls.ts"],"mappings":";qBAca,QAAM,OAAA"}
+{"version":3,"file":"mtls.d.ts","names":[],"sources":["../../../src/host/auth/mtls.ts"],"mappings":";;qBAca,QAAM,OAAA"}

package/dist/host/auth/mtls.js

@@ -1,5 +1,5 @@
-import { a as provide, l as make } from "../../Graft-CVyueNOf.js";
-import { n as CredentialsError } from "../../Errors-BMKmu5Y7.js";
+import { a as provide, l as make } from "../../Graft-B71CPA2Y.js";
+import { r as CredentialsError } from "../../Errors-DYhsGZcZ.js";
 import { t as ConfigDirectory } from "../../ConfigDirectory-BCC6q2R4.js";
 import { n as Credentials } from "../../Auth-BElTC9_X.js";
 import { Cause, Effect, FileSystem, Option, Path, Redacted, Schema } from "effect";

package/dist/host/auth/none.d.ts

@@ -1,3 +1,5 @@
-declare const _default: any;
+import { Graft, Plugin } from "@graftland/graft";
+import { Schema } from "effect";
+declare const _default: Plugin.Definition<{}, {}, Schema.SchemaError | Graft.ServiceConflict>;
 export { _default as default };
 //# sourceMappingURL=none.d.ts.map

package/dist/host/auth/none.js

@@ -1,4 +1,4 @@
-import { a as provide, l as make } from "../../Graft-CVyueNOf.js";
+import { a as provide, l as make } from "../../Graft-B71CPA2Y.js";
 import { n as Credentials } from "../../Auth-BElTC9_X.js";
 import { Effect, Schema } from "effect";
 // packages/remote/src/host/auth/none.ts

package/dist/host/command.d.ts

@@ -1,5 +1,6 @@
 import { ConnectorApi } from "../Transport.js";
 import { CommandOptions } from "../internal/transportOptions.js";
+import { Graft, Plugin } from "@graftland/graft";
 import { Cause, Effect, Schema } from "effect";
 import { ChildProcessSpawner } from "effect/process";
 declare const CommandExited_base: Schema.Class<CommandExited, Schema.TaggedStruct<"CommandExited", {
@@ -17,6 +18,18 @@ export declare const Config: Schema.Struct<{
   readonly cwd: Schema.optionalKey<Schema.String>;
   readonly env: Schema.optionalKey<Schema.$Record<Schema.String, Schema.String>>;
 }>;
-declare const _default: any;
+declare const _default: Plugin.Definition<{
+  readonly argv: readonly [string, ...string[]];
+  readonly cwd?: string;
+  readonly env?: {
+    readonly [x: string]: string;
+  };
+}, {
+  readonly argv: readonly [string, ...string[]];
+  readonly cwd?: string;
+  readonly env?: {
+    readonly [x: string]: string;
+  };
+}, Schema.SchemaError | Graft.ServiceConflict>;
 export { type CommandOptions as Options, _default as default };
 //# sourceMappingURL=command.d.ts.map

package/dist/host/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","names":["_$___Transport0.ConnectorApi"],"sources":["../../src/host/command.ts"],"mappings":";;;;;;;;;WAwBmB;;qBAFN,sBAAsB;;qBAUtB,OAAI,SAAa,mBAAc,OAAA,OAAdA,qBAAc,oBAAA;qBA2E/B,QAAM,OAAA"}
+{"version":3,"file":"command.d.ts","names":["_$___Transport0.ConnectorApi"],"sources":["../../src/host/command.ts"],"mappings":";;;;;;;;;;WAwBmB;;qBAFN,sBAAsB;;qBAUtB,OAAI,SAAa,mBAAc,OAAA,OAAdA,qBAAc,oBAAA;qBA2E/B,QAAM,OAAA"}

package/dist/host/command.js

@@ -1,9 +1,9 @@
-import { a as provide, l as make$1 } from "../Graft-CVyueNOf.js";
+import { a as provide, l as make$1 } from "../Graft-B71CPA2Y.js";
 import { t as Connector } from "../Transport-DULzpsgR.js";
 import { t as ConfigDirectory } from "../ConfigDirectory-BCC6q2R4.js";
-import { l as TransportError } from "../Errors-BMKmu5Y7.js";
-import { n as cleanupCause } from "../cleanup-CXLa1Wd9.js";
-import { n as stdinExitTimeout, t as observe } from "../ProcessObservation-DEGrEMfP.js";
+import { u as TransportError } from "../Errors-DYhsGZcZ.js";
+import { r as cleanupCause } from "../FailureGroup-BgT73AaR.js";
+import { n as stdinExitTimeout, t as observe } from "../ProcessObservation-gLgGirYv.js";
 import { Array, Cause, Effect, Option, Path, Schema, Scope, Sink, Stream } from "effect";
 import { ChildProcess, ChildProcessSpawner } from "effect/process";
 // packages/remote/src/host/command.ts

package/dist/host/local.d.ts

@@ -1,3 +1,4 @@
-declare const plugin: any;
+import { Plugin } from "@graftland/graft";
+declare const plugin: Plugin.Definition<void, void, import("effect/Schema").SchemaError | import("@graftland/graft/Graft").ServiceConflict>;
 export { plugin as default };
 //# sourceMappingURL=local.d.ts.map

package/dist/host/local.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local.d.ts","names":[],"sources":["../../src/host/local.ts"],"mappings":"A,cA+BM"}
+{"version":3,"file":"local.d.ts","names":[],"sources":["../../src/host/local.ts"],"mappings":";cA+BM,QAAM,OAAA,+CAAA,+CAAA"}

package/dist/host/local.js

@@ -1,8 +1,8 @@
-import { d as service } from "../Graft-CVyueNOf.js";
+import { d as service } from "../Graft-B71CPA2Y.js";
 import { t as LocalTransport } from "../directTransport-DrexuPSm.js";
 import { t as command } from "../command-9zrHdbwT.js";
-import { a as ProcessExited, l as TransportError } from "../Errors-BMKmu5Y7.js";
-import { t as observe$1 } from "../ProcessObservation-DEGrEMfP.js";
+import { o as ProcessExited, u as TransportError } from "../Errors-DYhsGZcZ.js";
+import { t as observe$1 } from "../ProcessObservation-gLgGirYv.js";
 import { Array, Cause, Effect, Fiber, Option, Scope, Sink, Stream } from "effect";
 import { ChildProcess, ChildProcessSpawner } from "effect/process";
 // packages/remote/src/internal/host/local.ts

package/dist/host/unix.d.ts

@@ -1,11 +1,16 @@
 import { UnixOptions } from "../internal/transportOptions.js";
 import { ConnectorApi } from "../Transport.js";
+import { Graft, Plugin } from "@graftland/graft";
 import { Schema } from "effect";
 export declare const properties: ConnectorApi["properties"];
 export declare const make: (options: UnixOptions) => ConnectorApi;
 export declare const Config: Schema.Struct<{
   readonly path: Schema.String;
 }>;
-declare const _default: any;
+declare const _default: Plugin.Definition<{
+  readonly path: string;
+}, {
+  readonly path: string;
+}, Schema.SchemaError | Graft.ServiceConflict>;
 export { type UnixOptions as Options, _default as default };
 //# sourceMappingURL=unix.d.ts.map

package/dist/host/unix.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unix.d.ts","names":[],"sources":["../../src/host/unix.ts"],"mappings":";;;qBAca,YAAY;qBAmBZ,OAAI,SAAa,gBAAc;qBAe/B,QAAM,OAAA"}
+{"version":3,"file":"unix.d.ts","names":[],"sources":["../../src/host/unix.ts"],"mappings":";;;;qBAca,YAAY;qBAmBZ,OAAI,SAAa,gBAAc;qBAe/B,QAAM,OAAA"}

package/dist/host/unix.js

@@ -1,8 +1,8 @@
-import { a as provide, l as make$1 } from "../Graft-CVyueNOf.js";
+import { a as provide, l as make$1 } from "../Graft-B71CPA2Y.js";
 import { t as ConfigDirectory } from "../ConfigDirectory-BCC6q2R4.js";
-import { a as payloadLimit, c as wrapper_default, i as path, s as protocol, t as fromSocket } from "../socketChannel-C_ppdSzz.js";
+import { a as payloadLimit, c as wrapper_default, i as path, s as protocol, t as fromSocket } from "../socketChannel-CJvL2DiB.js";
 import { t as Connector } from "../Transport-DULzpsgR.js";
-import { l as TransportError } from "../Errors-BMKmu5Y7.js";
+import { u as TransportError } from "../Errors-DYhsGZcZ.js";
 import { Cause, Effect, Layer, Option, Path, Redacted, Schema } from "effect";
 import { Socket } from "effect/socket";
 // packages/remote/src/host/unix.ts

package/dist/host/websocket.d.ts

@@ -1,5 +1,6 @@
 import { WebsocketOptions } from "../internal/transportOptions.js";
 import { ConnectorApi } from "../Transport.js";
+import { Graft, Plugin } from "@graftland/graft";
 import { Schema } from "effect";
 /** Configured Connector; certificate paths belong to the enclosing configuration. */
 export declare const Config: Schema.Struct<{
@@ -8,6 +9,14 @@ export declare const Config: Schema.Struct<{
   readonly servername: Schema.optionalKey<Schema.String>;
 }>;
 export declare const make: (options: WebsocketOptions, properties: ConnectorApi["properties"]) => ConnectorApi;
-declare const _default: any;
+declare const _default: Plugin.Definition<{
+  readonly url: URL;
+  readonly ca?: string;
+  readonly servername?: string;
+}, {
+  readonly url: string;
+  readonly ca?: string;
+  readonly servername?: string;
+}, import("effect/PlatformError").PlatformError | Schema.SchemaError | Graft.ServiceConflict>;
 export { type WebsocketOptions as Options, _default as default };
 //# sourceMappingURL=websocket.d.ts.map

package/dist/host/websocket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"websocket.d.ts","names":[],"sources":["../../src/host/websocket.ts"],"mappings":";;;;qBAYa,QAAM,OAAA;;;;;qBAKN,OAAI,SACP,kBAAgB,YACb,+BACV"}
+{"version":3,"file":"websocket.d.ts","names":[],"sources":["../../src/host/websocket.ts"],"mappings":";;;;;qBAYa,QAAM,OAAA;;;;;qBAKN,OAAI,SACP,kBAAgB,YACb,+BACV"}

package/dist/host/websocket.js

@@ -1,8 +1,8 @@
-import { a as provide, l as make$1 } from "../Graft-CVyueNOf.js";
+import { a as provide, l as make$1 } from "../Graft-B71CPA2Y.js";
 import { t as Connector } from "../Transport-DULzpsgR.js";
-import { l as TransportError } from "../Errors-BMKmu5Y7.js";
+import { u as TransportError } from "../Errors-DYhsGZcZ.js";
 import { t as ConfigDirectory } from "../ConfigDirectory-BCC6q2R4.js";
-import { n as Url, o as properties, r as open, t as fromSocket } from "../socketChannel-C_ppdSzz.js";
+import { n as Url, o as properties, r as open, t as fromSocket } from "../socketChannel-CJvL2DiB.js";
 import { Cause, Effect, FileSystem, Option, Path, Schema } from "effect";
 // packages/remote/src/host/websocket.ts
 /** Configured Connector; certificate paths belong to the enclosing configuration. */

package/dist/host/worker.d.ts

@@ -1,3 +1,5 @@
-declare const plugin: any;
+import { Plugin } from "@graftland/graft";
+import { Schema } from "effect";
+declare const plugin: Plugin.Definition<void, void, Schema.SchemaError | import("@graftland/graft/Graft").ServiceConflict>;
 export { plugin as default };
 //# sourceMappingURL=worker.d.ts.map

package/dist/host/worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker.d.ts","names":[],"sources":["../../src/host/worker.ts"],"mappings":"A,cAoFM"}
+{"version":3,"file":"worker.d.ts","names":[],"sources":["../../src/host/worker.ts"],"mappings":";;cAoFM,QAAM,OAAA,uBAAA,OAAA,+CAAA"}

package/dist/host/worker.js

@@ -1,9 +1,8 @@
-import { d as service } from "../Graft-CVyueNOf.js";
+import { d as service } from "../Graft-B71CPA2Y.js";
 import { n as WorkerTransport } from "../directTransport-DrexuPSm.js";
-import { a as ProcessExited, l as TransportError } from "../Errors-BMKmu5Y7.js";
-import { n as Bootstrap, t as make } from "../workerChannel-cmLc13vm.js";
-import { t as make$1 } from "../FailureGroup-BcH0XOBi.js";
-import { n as cleanupCause } from "../cleanup-CXLa1Wd9.js";
+import { o as ProcessExited, u as TransportError } from "../Errors-DYhsGZcZ.js";
+import { n as Bootstrap, t as make } from "../workerChannel-C8hhBJzA.js";
+import { r as cleanupCause, t as make$1 } from "../FailureGroup-BgT73AaR.js";
 import { Cause, Deferred, Effect, FiberSet, Option, Schema } from "effect";
 import { Worker } from "node:worker_threads";
 // packages/remote/src/host/worker.ts

package/dist/{importer-Bk6U_sn4.js → importer-Cvf88eAY.js}

@@ -1,4 +1,4 @@
-import { s as fromModule } from "./Graft-CVyueNOf.js";
+import { s as fromModule } from "./Graft-B71CPA2Y.js";
 import { t as ConfigDirectory } from "./ConfigDirectory-BCC6q2R4.js";
 import { registerHooks } from "node:module";
 import { Array, Cause, Config, Context, Data, Effect, Exit, HashMap, MutableList, Option, Path, Predicate, Record, Ref, Result, Schema, Scope, String } from "effect";
@@ -202,7 +202,7 @@ const inCandidateScope = (effect) => Effect.uninterruptibleMask((restore) => Eff
 * Importers may attach observation-only leases to the separate observationScope.
 * The caller keeps that scope through failure and closes it on retry or disposal.
 */
-const make$1 = (options) => Effect.gen(function* () {
+const make$1 = Effect.fnUntraced(function* (options) {
 	const path = yield* Path.Path;
 	/** Keep the import target and Node's possible missing names in one normalization step. */
 	const normalize = Effect.fnUntraced(function* (specifier) {
@@ -253,14 +253,11 @@ const make$1 = (options) => Effect.gen(function* () {
 		});
 		const environment = options.resolution;
 		const revision = environment === void 0 ? 0 : yield* environment.revision;
-		const cached = yield* Ref.get(plans);
-		if (cached.revision === revision) {
-			const found = HashMap.get(cached.entries, key);
-			if (Option.isSome(found)) return found.value;
-		} else yield* Ref.set(plans, {
+		const found = yield* Ref.modify(plans, (current) => current.revision === revision ? [HashMap.get(current.entries, key), current] : revision > current.revision ? [Option.none(), {
 			revision,
 			entries: HashMap.empty()
-		});
+		}] : [Option.none(), current]);
+		if (Option.isSome(found)) return found.value;
 		const normalized = yield* Effect.forEach(candidates(name), (specifier) => Effect.map(normalize(specifier), (candidate) => ({
 			...candidate,
 			specifier

package/dist/index.js

@@ -1,11 +1,11 @@
-import { a as provide, l as make, u as optional } from "./Graft-CVyueNOf.js";
-import { r as ModuleResolver } from "./importer-Bk6U_sn4.js";
-import { a as publicError, d as follow, f as Host, n as host, r as launch, s as CapabilityFailed } from "./entry-B89sepMU.js";
+import { a as provide, l as make, u as optional } from "./Graft-B71CPA2Y.js";
+import { r as ModuleResolver } from "./importer-Cvf88eAY.js";
+import { a as publicError, d as follow, f as Host, n as host, r as launch, s as CapabilityFailed } from "./entry-psOpX3Bj.js";
 import { n as Credentials } from "./Auth-BElTC9_X.js";
-import { c as RemoteWithdrawn, i as MissingInstance, n as CredentialsError, s as RemoteError } from "./Errors-BMKmu5Y7.js";
-import { n as prepare } from "./token-Cc_1CTbE.js";
-import { n as UndeclaredFailure, t as Contract_exports } from "./Contract-DL2mHvaT.js";
-import { O as Instance, l as RemoteTerminationUnconfirmed } from "./Peer-BT7eAGmh.js";
+import { a as MissingInstance, c as RemoteError, l as RemoteWithdrawn, r as CredentialsError } from "./Errors-DYhsGZcZ.js";
+import { n as prepare } from "./token-CYBNNlhS.js";
+import { n as UndeclaredFailure, t as Contract_exports } from "./Contract-DsJtisvL.js";
+import { O as Instance, l as RemoteTerminationUnconfirmed } from "./Peer-DXeVrGBh.js";
 import { Array, Cause, Context, Effect, Path, Schema, Scope } from "effect";
 import { SecureRandom } from "effect/crypto";
 import { ChildProcessSpawner } from "effect/process";
@@ -69,7 +69,7 @@ const plugin = (contract, options) => make({
 		ChildProcessSpawner.ChildProcessSpawner
 	],
 	retry: options.retry,
-	apply: () => Effect.gen(function* () {
+	apply: Effect.fnUntraced(function* () {
 		const input = yield* Schema.decodeUnknownEffect(Host)({
 			contract: options.contractModule,
 			connect: options.connect,
@@ -81,6 +81,6 @@ const plugin = (contract, options) => make({
 			shutdownTimeout: options.shutdownTimeout
 		}, invocation(options.connect));
 		yield* follow(child, (cause) => Effect.failCause(publicCause(contract.error, cause)));
-	}).pipe(Effect.mapError((error) => publicError(contract.error, error)))
+	}, Effect.mapError((error) => publicError(contract.error, error)))
 });
 export { Contract_exports as Contract, Instance, MissingInstance, RemoteError, RemoteTerminationUnconfirmed, RemoteWithdrawn, UndeclaredFailure, host as default, plugin };