@deslop/opm 0.1.1247 → 0.1.1249

package/dist/server.js

@@ -5064,41 +5064,6 @@ const mergeAll$2 = (...ctxs) => {
 	return makeUnsafe$9(map);
 };
 /**
-* Returns a new `Context` with the specified service keys removed.
-*
-* **When to use**
-*
-* Use when you want to remove a denylist of services from a `Context`.
-*
-* **Example** (Omitting services from a context)
-*
-* ```ts import.meta.vitest
-* import { Context, Option, pipe } from "effect"
-*
-* const Port = Context.Service<{ PORT: number }>("Port")
-* const Timeout = Context.Service<{ TIMEOUT: number }>("Timeout")
-*
-* const someContext = pipe(
-*   Context.make(Port, { PORT: 8080 }),
-*   Context.add(Timeout, { TIMEOUT: 5000 })
-* )
-*
-* const context = pipe(someContext, Context.omit(Timeout))
-*
-* Context.getOption(context, Port) // => Option.some({ PORT: 8080 })
-* Context.getOption(context, Timeout) // => Option.none()
-* ```
-*
-* @see {@link pick} for keeping selected services
-*
-* @stability stable
-* @category filtering
-* @since 2.0.0
-*/
-const omit$1 = (...keys) => (self) => withFlat(self, (map) => {
-	for (let i = 0; i < keys.length; i++) map.delete(keys[i].key);
-});
-/**
 * Creates a context key with a default value.
 *
 * **When to use**
@@ -10178,7 +10143,7 @@ const forever$2 = /*#__PURE__*/ dual((args) => isEffect$1(args[0]), (self, optio
 	step: constVoid
 }));
 /** @internal */
-const catchCause$2 = /*#__PURE__*/ dual(2, (self, f) => new OnFailureImpl(self, f.length !== 1 ? (cause) => f(cause) : f));
+const catchCause$3 = /*#__PURE__*/ dual(2, (self, f) => new OnFailureImpl(self, f.length !== 1 ? (cause) => f(cause) : f));
 const OnFailureProto = /*#__PURE__*/ makePrimitiveProto({
 	op: "OnFailure",
 	[evaluate]: evaluateCont
@@ -10189,7 +10154,7 @@ const OnFailureImpl = function(self, f) {
 };
 OnFailureImpl.prototype = OnFailureProto;
 /** @internal */
-const catchCauseFilter$1 = /*#__PURE__*/ dual(3, (self, filter, f) => catchCause$2(self, (cause) => {
+const catchCauseFilter$1 = /*#__PURE__*/ dual(3, (self, filter, f) => catchCause$3(self, (cause) => {
 	const eb = filter(cause);
 	return isFailure$1(eb) ? failCause$5(eb.failure) : f(eb.success, cause);
 }));
@@ -10198,9 +10163,9 @@ const catch_$2 = /*#__PURE__*/ dual(2, (self, f) => catchCauseFilter$1(self, fin
 /** @internal */
 const catchDefect$1 = /*#__PURE__*/ dual(2, (self, f) => catchCauseFilter$1(self, findDefect, f));
 /** @internal */
-const tapCause$1 = /*#__PURE__*/ dual(2, (self, f) => catchCause$2(self, (cause) => andThen$1(f(cause), failCause$5(cause))));
+const tapCause$1 = /*#__PURE__*/ dual(2, (self, f) => catchCause$3(self, (cause) => andThen$1(f(cause), failCause$5(cause))));
 /** @internal */
-const tapCauseFilter = /*#__PURE__*/ dual(3, (self, filter, f) => catchCause$2(self, (cause) => {
+const tapCauseFilter = /*#__PURE__*/ dual(3, (self, filter, f) => catchCause$3(self, (cause) => {
 	const result = filter(cause);
 	if (isFailure$1(result)) return failCause$5(cause);
 	return andThen$1(f(result.success, cause), failCause$5(cause));
@@ -10208,14 +10173,14 @@ const tapCauseFilter = /*#__PURE__*/ dual(3, (self, filter, f) => catchCause$2(s
 /** @internal */
 const tapError$4 = /*#__PURE__*/ dual(2, (self, f) => tapCauseFilter(self, findError, (e) => f(e)));
 /** @internal */
-const catchIf$1 = /*#__PURE__*/ dual((args) => isEffect$1(args[0]), (self, predicate, f, orElse) => catchCause$2(self, (cause) => {
+const catchIf$1 = /*#__PURE__*/ dual((args) => isEffect$1(args[0]), (self, predicate, f, orElse) => catchCause$3(self, (cause) => {
 	const error = findRecoverableError(cause);
 	if (isFailure$1(error)) return failCause$5(error.failure);
 	if (!predicate(error.success)) return orElse ? orElse(error.success) : failCause$5(cause);
 	return f(error.success);
 }));
 /** @internal */
-const catchFilter$1 = /*#__PURE__*/ dual((args) => isEffect$1(args[0]), (self, filter, f, orElse) => catchCause$2(self, (cause) => {
+const catchFilter$1 = /*#__PURE__*/ dual((args) => isEffect$1(args[0]), (self, filter, f, orElse) => catchCause$3(self, (cause) => {
 	const error = findRecoverableError(cause);
 	if (isFailure$1(error)) return failCause$5(error.failure);
 	const result = filter(error.success);
@@ -10242,7 +10207,7 @@ const catchReason$1 = /*#__PURE__*/ dual((args) => isEffect$1(args[0]), (self, e
 	return orElse ? orElse(reason, e) : fail$10(e);
 }));
 /** @internal */
-const mapError$3 = /*#__PURE__*/ dual(2, (self, f) => catchCause$2(self, (cause) => failCause$5(causeMap(cause, f))));
+const mapError$3 = /*#__PURE__*/ dual(2, (self, f) => catchCause$3(self, (cause) => failCause$5(causeMap(cause, f))));
 /** @internal */
 const mapBoth = /*#__PURE__*/ dual(2, (self, options) => matchCauseEffect$1(self, {
 	onFailure: (cause) => failCause$5(causeMap(cause, options.onFailure)),
@@ -10382,9 +10347,9 @@ const delay$1 = /*#__PURE__*/ dual(2, (self, duration) => andThen$1(sleep$1(dura
 /** @internal */
 const timeoutOrElse$1 = /*#__PURE__*/ dual(2, (self, options) => flatMap$5(timeoutOption$1(self, options.duration), (option) => isNone(option) ? options.orElse() : succeed$8(option.value)));
 /** @internal */
-const timeoutErrorFromDuration = (duration) => new TimeoutError(`Operation timed out after '${format$1(duration)}'`);
+const timeoutErrorFromDuration = (duration) => new TimeoutError$1(`Operation timed out after '${format$1(duration)}'`);
 /** @internal */
-const timeout$1 = /*#__PURE__*/ dual(2, (self, duration) => {
+const timeout$2 = /*#__PURE__*/ dual(2, (self, duration) => {
 	const decoded = fromInputUnsafe$1(duration);
 	return timeoutOrElse$1(self, {
 		duration: decoded,
@@ -10426,7 +10391,7 @@ const runFinalizer = (finalizer, exit_) => {
 		return exitDie(defect);
 	}
 };
-const combineFinalizerCause = (exit_, finalizer) => exitIsSuccess(exit_) ? finalizer : catchCause$2(finalizer, (cause) => failCause$5(causeElectDefects(causeCombine(exit_.cause, cause))));
+const combineFinalizerCause = (exit_, finalizer) => exitIsSuccess(exit_) ? finalizer : catchCause$3(finalizer, (cause) => failCause$5(causeElectDefects(causeCombine(exit_.cause, cause))));
 const scopeCloseFinalizers = /*#__PURE__*/ fnUntraced$1(function* (self, finalizers, exit_) {
 	let exits = [];
 	const fibers = [];
@@ -11174,6 +11139,15 @@ const withSpan$1 = function() {
 	return (self, ...args) => useSpan$1(name, fnArg ? fnArg(...args) : options, (span) => withParentSpan$1(self, span, traceOptions));
 };
 /** @internal */
+const annotateCurrentSpan$1 = (...args) => withFiber$1((fiber) => {
+	const span = fiber.currentSpanLocal;
+	if (span && span.status._tag !== "Ended") {
+		if (args.length === 1) for (const [key, value] of Object.entries(args[0])) span.attribute(key, value);
+		else span.attribute(args[0], args[1]);
+	}
+	return void_$3;
+});
+/** @internal */
 const ClockRef = /*#__PURE__*/ Reference("effect/Clock", { defaultValue: () => new ClockImpl() });
 const MAX_TIMER_MILLIS = 2 ** 31 - 1;
 var ClockImpl = class {
@@ -11241,7 +11215,7 @@ const TimeoutErrorTypeId = "~effect/Cause/TimeoutError";
 /** @internal */
 const isTimeoutError$1 = (u) => hasProperty(u, TimeoutErrorTypeId);
 /** @internal */
-var TimeoutError = class extends (/*#__PURE__*/ TaggedError$2("TimeoutError")) {
+var TimeoutError$1 = class extends (/*#__PURE__*/ TaggedError$2("TimeoutError")) {
 	[TimeoutErrorTypeId] = TimeoutErrorTypeId;
 	constructor(message) {
 		super({ message });
@@ -12021,6 +11995,22 @@ const done$1 = done$2;
 */
 const isTimeoutError = isTimeoutError$1;
 /**
+* Constructs a `TimeoutError` with an optional message.
+*
+* **Example** (Creating a TimeoutError)
+*
+* ```ts import.meta.vitest
+* import { Cause } from "effect"
+*
+* new Cause.TimeoutError("Operation timed out").message // => "Operation timed out"
+* ```
+*
+* @stability stable
+* @category constructors
+* @since 4.0.0
+*/
+const TimeoutError = TimeoutError$1;
+/**
 * Constructs an `IllegalArgumentError` with an optional message.
 *
 * **Example** (Creating an IllegalArgumentError)
@@ -14267,6 +14257,63 @@ const provideMerge = /*#__PURE__*/ dual(2, (self, that) => provideWith(self, tha
 */
 const flatMap$4 = /*#__PURE__*/ dual(2, (self, f) => fromBuild((memoMap, scope) => flatMap$5(self.build(memoMap, scope), (context) => f(context).build(memoMap, scope))));
 /**
+* Recovers from any failure cause by switching to another layer.
+*
+* **When to use**
+*
+* Use when you need `Layer` recovery to inspect more than the typed error,
+* such as defects or interruption information.
+*
+* **Details**
+*
+* The handler receives the full `Cause` of the failed layer, including typed
+* errors, unexpected defects, and interruption information, and returns the
+* fallback layer to build instead. Finalizers for resources acquired by the
+* failed layer are still run before the fallback layer is acquired.
+*
+* **Example** (Recovering from layer failures by cause)
+*
+* ```ts import.meta.vitest
+* import { Context, Data, Effect, Layer } from "effect"
+*
+* class DatabaseError extends Data.TaggedError("DatabaseError")<{
+*   message: string
+* }> {}
+*
+* class Database extends Context.Service<Database, {
+*   readonly query: (sql: string) => Effect.Effect<string>
+* }>()("Database") {}
+*
+* const primaryDatabaseLayer = Layer.effect(Database,
+*   Effect.fail(new DatabaseError({ message: "Primary DB unreachable" }))
+* )
+*
+* const databaseWithFallback = primaryDatabaseLayer.pipe(
+*   Layer.catchCause(() => {
+*     return Layer.succeed(Database, {
+*       query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Memory: ${sql}`))
+*     })
+*   })
+* )
+*
+* const program = Effect.gen(function*() {
+*   const database = yield* Database
+*   return yield* database.query("SELECT * FROM users")
+* }).pipe(
+*   Effect.provide(databaseWithFallback)
+* )
+*
+* await Effect.runPromise(program) // => "Memory: SELECT * FROM users"
+* ```
+*
+* @see {@link catchTag} for recovering from specific tagged errors
+*
+* @stability stable
+* @category error handling
+* @since 4.0.0
+*/
+const catchCause$2 = /*#__PURE__*/ dual(2, (self, onError) => fromBuildUnsafe((memoMap, scope) => catchCause$3(self.build(memoMap, scope), (cause) => onError(cause).build(memoMap, scope))));
+/**
 * Builds this layer and keeps it alive until the returned effect is interrupted.
 *
 * **When to use**
@@ -15485,7 +15532,7 @@ const fromStepWithMetadata = (step) => fromStep(map$8(step, (f) => {
 * @category destructors
 * @since 4.0.0
 */
-const toStep = (schedule) => catchCause$2(schedule.step, (cause) => succeed$8(() => failCause$5(cause)));
+const toStep = (schedule) => catchCause$3(schedule.step, (cause) => succeed$8(() => failCause$5(cause)));
 /**
 * Extracts a step function from a `Schedule` that sleeps for each computed
 * delay and returns metadata for the completed step.
@@ -17426,7 +17473,7 @@ const catchReason = catchReason$1;
 * @category error handling
 * @since 4.0.0
 */
-const catchCause$1 = catchCause$2;
+const catchCause$1 = catchCause$3;
 /**
 * Recovers from defects using a provided recovery function.
 *
@@ -17977,7 +18024,7 @@ const firstSuccessOf = firstSuccessOf$1;
 * @category delays & timeouts
 * @since 2.0.0
 */
-const timeout = timeout$1;
+const timeout$1 = timeout$2;
 /**
 * Runs an effect with a time limit and represents only the timeout case as
 * `Option.none`.
@@ -19385,6 +19432,31 @@ const repeat = repeat$1;
 */
 const withTracerEnabled = withTracerEnabled$1;
 /**
+* Adds an annotation to the current span if available.
+*
+* **Example** (Annotating the current span)
+*
+* ```ts import.meta.vitest
+* import { Effect } from "effect"
+*
+* const program = Effect.gen(function*() {
+*   yield* Effect.annotateCurrentSpan("userId", "123")
+*   yield* Effect.annotateCurrentSpan({
+*     operation: "user-lookup"
+*   })
+*   return "success"
+* })
+*
+* const traced = Effect.withSpan(program, "user-operation")
+* Effect.runSync(traced) // => "success"
+* ```
+*
+* @stability stable
+* @category tracing
+* @since 2.0.0
+*/
+const annotateCurrentSpan = annotateCurrentSpan$1;
+/**
 * Create a new span for tracing, and automatically close it when the effect
 * completes.
 *
@@ -29185,7 +29257,7 @@ const compose = /*#__PURE__*/ dual(2, (self, other) => {
 	if (other._tag === "Passthrough") return self;
 	switch (self._tag) {
 		case "Transform": switch (other._tag) {
-			case "Transform": return transform$2((input) => other.transform(self.transform(input)));
+			case "Transform": return transform$3((input) => other.transform(self.transform(input)));
 			case "TransformOptional": return transformOptional((input) => other.transform(map$12(input, self.transform)));
 			case "TransformEffect": return transformEffect$1((input, options) => other.transform(self.transform(input), options));
 			case "TransformOptionalEffect": return composeOptionalEffect(self, other);
@@ -29247,7 +29319,7 @@ function passthrough$1() {
 * @category transforming
 * @since 4.0.0
 */
-function transform$2(f) {
+function transform$3(f) {
 	return makeGetter({
 		_tag: "Transform",
 		transform: f
@@ -29374,7 +29446,7 @@ function transformOptionalEffect(f) {
 * @since 4.0.0
 */
 function String$8() {
-	return transform$2(globalThis.String);
+	return transform$3(globalThis.String);
 }
 /**
 * Coerces any value to a `number` using the global `Number()` constructor.
@@ -29405,7 +29477,7 @@ function String$8() {
 * @since 4.0.0
 */
 function Number$4() {
-	return transform$2(globalThis.Number);
+	return transform$3(globalThis.Number);
 }
 function parseJson(options) {
 	return transformEffect$1((input, parseOptions) => try_({
@@ -29495,7 +29567,7 @@ function splitKeyValue$1(options) {
 	const keyValueSeparator = options?.keyValueSeparator ?? "=";
 	const trim = options?.trim ?? false;
 	const keepEmptyValues = options?.keepEmptyValues ?? false;
-	return transform$2((input) => input.split(separator).reduce((acc, pair) => {
+	return transform$3((input) => input.split(separator).reduce((acc, pair) => {
 		let key;
 		let value;
 		if (keyValueSeparator === "") {
@@ -29549,7 +29621,7 @@ function splitKeyValue$1(options) {
 function joinKeyValue(options) {
 	const separator = options?.separator ?? ",";
 	const keyValueSeparator = options?.keyValueSeparator ?? "=";
-	return transform$2((input) => Object.entries(input).map(([key, value]) => `${key}${keyValueSeparator}${value}`).join(separator));
+	return transform$3((input) => Object.entries(input).map(([key, value]) => `${key}${keyValueSeparator}${value}`).join(separator));
 }
 /**
 * Splits a string into an array of strings by a separator.
@@ -29582,7 +29654,7 @@ function joinKeyValue(options) {
 */
 function split(options) {
 	const separator = options?.separator ?? ",";
-	return transform$2((input) => input === "" ? [] : input.split(separator));
+	return transform$3((input) => input === "" ? [] : input.split(separator));
 }
 /**
 * Encodes a `Uint8Array` or string to a Base64 string.
@@ -29610,7 +29682,7 @@ function split(options) {
 * @since 4.0.0
 */
 function encodeBase64() {
-	return transform$2(encode);
+	return transform$3(encode);
 }
 /**
 * Decodes a Base64 string to a `Uint8Array`.
@@ -29665,7 +29737,7 @@ function decodeBase64$1() {
 * @since 4.0.0
 */
 function encodeUriComponent() {
-	return transform$2(encodeURIComponent);
+	return transform$3(encodeURIComponent);
 }
 /**
 * Decodes a URI component encoded string using `decodeURIComponent`.
@@ -29906,8 +29978,8 @@ function transformEffect(options) {
 * @category transforming
 * @since 3.10.0
 */
-function transform$1(options) {
-	return new Transformation(transform$2(options.decode), transform$2(options.encode));
+function transform$2(options) {
+	return new Transformation(transform$3(options.decode), transform$3(options.encode));
 }
 /**
 * Transforms a string into a record of key-value pairs and
@@ -30031,7 +30103,7 @@ const makeEncodeDefect = (options) => {
 };
 const decodeDefect = (input) => isJsonError(input) ? decodeJsonError(input) : input;
 /** @internal */
-const defectFromJson = (options) => transform$1({
+const defectFromJson = (options) => transform$2({
 	decode: decodeDefect,
 	encode: makeEncodeDefect(options)
 });
@@ -30396,7 +30468,7 @@ const Undefined$1 = class extends ASTNodeImpl {
 		return "undefined";
 	}
 };
-const undefinedToNull = /*#__PURE__*/ new Link(null_, /*#__PURE__*/ new Transformation(/*#__PURE__*/ transform$2(() => void 0), /*#__PURE__*/ transform$2(() => null)));
+const undefinedToNull = /*#__PURE__*/ new Link(null_, /*#__PURE__*/ new Transformation(/*#__PURE__*/ transform$3(() => void 0), /*#__PURE__*/ transform$3(() => null)));
 const undefined_ = /*#__PURE__*/ new Undefined$1();
 /**
 * Constructs a {@link Void}.
@@ -30634,7 +30706,7 @@ function templateLiteralTransformation(template) {
 		const segments = segmentTemplateLiteralParts(template, s, options);
 		if (segments) return succeed$5(segments);
 		return fail$6(new InvalidValue$1({ expected: "a string matching template literal parts" }, s, options));
-	}), transform$2((parts) => parts.join("")));
+	}), transform$3((parts) => parts.join("")));
 }
 /**
 * Constructs a {@link Literal}.
@@ -30674,7 +30746,7 @@ const Literal$1 = class extends ASTNodeImpl {
 };
 function literalToString(ast) {
 	const literalAsString = globalThis.String(ast.literal);
-	return replaceEncoding(ast, [new Link(new Literal$1(literalAsString), new Transformation(transform$2(() => ast.literal), transform$2(() => literalAsString)))]);
+	return replaceEncoding(ast, [new Link(new Literal$1(literalAsString), new Transformation(transform$3(() => ast.literal), transform$3(() => literalAsString)))]);
 }
 /**
 * Constructs a {@link String}.
@@ -31741,7 +31813,7 @@ function isFinite$1(annotations) {
 }
 /** @internal */
 const finite = /*#__PURE__*/ appendChecks(number, [/*#__PURE__*/ isFinite$1()]);
-const numberToJson = /*#__PURE__*/ new Link(/*#__PURE__*/ new Union$1([finite, nonFiniteLiterals]), /*#__PURE__*/ new Transformation(/*#__PURE__*/ Number$4(), /*#__PURE__*/ transform$2((n) => globalThis.Number.isFinite(n) ? n : globalThis.String(n))));
+const numberToJson = /*#__PURE__*/ new Link(/*#__PURE__*/ new Union$1([finite, nonFiniteLiterals]), /*#__PURE__*/ new Transformation(/*#__PURE__*/ Number$4(), /*#__PURE__*/ transform$3((n) => globalThis.Number.isFinite(n) ? n : globalThis.String(n))));
 /**
 * Creates a {@link Filter} that validates strings by running `RegExp.test`.
 *
@@ -32991,9 +33063,9 @@ function toCodecStringTreeASTStep(ast, recur, onMissingAnnotation) {
 	}
 	return ast;
 }
-const nullToString = /*#__PURE__*/ new Link(/*#__PURE__*/ new Literal$1("null"), /*#__PURE__*/ new Transformation(/*#__PURE__*/ transform$2(() => null), /*#__PURE__*/ transform$2(() => "null")));
-const booleanToString = /*#__PURE__*/ new Link(/*#__PURE__*/ new Union$1([/*#__PURE__*/ new Literal$1("true"), /*#__PURE__*/ new Literal$1("false")]), /*#__PURE__*/ new Transformation(/*#__PURE__*/ transform$2((s) => s === "true"), /*#__PURE__*/ String$8()));
-const arrayFromSingleTransformation = /*#__PURE__*/ new Transformation(/*#__PURE__*/ transform$2((input) => typeof input === "string" ? [input] : input), /*#__PURE__*/ passthrough$1());
+const nullToString = /*#__PURE__*/ new Link(/*#__PURE__*/ new Literal$1("null"), /*#__PURE__*/ new Transformation(/*#__PURE__*/ transform$3(() => null), /*#__PURE__*/ transform$3(() => "null")));
+const booleanToString = /*#__PURE__*/ new Link(/*#__PURE__*/ new Union$1([/*#__PURE__*/ new Literal$1("true"), /*#__PURE__*/ new Literal$1("false")]), /*#__PURE__*/ new Transformation(/*#__PURE__*/ transform$3((s) => s === "true"), /*#__PURE__*/ String$8()));
+const arrayFromSingleTransformation = /*#__PURE__*/ new Transformation(/*#__PURE__*/ transform$3((input) => typeof input === "string" ? [input] : input), /*#__PURE__*/ passthrough$1());
 const isCodecArrayFromSingleLink = (link) => link.transformation === arrayFromSingleTransformation;
 const toCodecStringTreeAST = /*#__PURE__*/ makeCodecDerivation((ast, recur) => toCodecStringTreeASTStep(ast, recur, (ast) => {
 	throw new globalThis.Error("Missing structural codec for StringTree", { cause: ast });
@@ -34267,8 +34339,8 @@ function Literal(literal) {
 		literal,
 		transform(to) {
 			return out.pipe(decodeTo(Literal(to), {
-				decode: transform$2(() => to),
-				encode: transform$2(() => literal)
+				decode: transform$3(() => to),
+				encode: transform$3(() => literal)
 			}));
 		}
 	});
@@ -34687,7 +34759,7 @@ const FalseLiterals = /*#__PURE__*/ Literals([
 	"n"
 ]);
 /** @internal */
-const BooleanLiterals = /*#__PURE__*/ Literals([...TrueLiterals.literals, ...FalseLiterals.literals]).pipe(/*#__PURE__*/ decodeTo(Boolean$5, /*#__PURE__*/ transform$1({
+const BooleanLiterals = /*#__PURE__*/ Literals([...TrueLiterals.literals, ...FalseLiterals.literals]).pipe(/*#__PURE__*/ decodeTo(Boolean$5, /*#__PURE__*/ transform$2({
 	decode: (value) => value === "true" || value === "yes" || value === "on" || value === "1" || value === "y",
 	encode: (value) => value ? "true" : "false"
 })));
@@ -35347,7 +35419,7 @@ function CauseReason(error, defect) {
 				_tag: Literal("Interrupt"),
 				fiberId: UndefinedOr(Finite)
 			})
-		]), transform$1({
+		]), transform$2({
 			decode: (e) => {
 				switch (e._tag) {
 					case "Fail": return makeFailReason(e.error);
@@ -35421,7 +35493,7 @@ function Cause(error, defect) {
 			importDeclarations: [`import * as Cause from "effect/Cause"`]
 		}),
 		expected: "Cause",
-		toCodec: ([error, defect]) => link$1()(ArraySchema(CauseReason(error, defect)), transform$1({
+		toCodec: ([error, defect]) => link$1()(ArraySchema(CauseReason(error, defect)), transform$2({
 			decode: fromReasons,
 			encode: ({ reasons: failures }) => failures
 		}))
@@ -35481,7 +35553,7 @@ function Exit(value, error, defect) {
 		}), Struct({
 			_tag: Literal("Failure"),
 			cause: Cause(error, defect)
-		})]), transform$1({
+		})]), transform$2({
 			decode: (e) => e._tag === "Success" ? succeed$7(e.value) : failCause$4(e.cause),
 			encode: (exit) => isSuccess(exit) ? {
 				_tag: "Success",
@@ -35581,7 +35653,7 @@ function makeClassTrusted(self, fields) {
 	} });
 }
 function getClassTransformation(self) {
-	return new Transformation(transform$2((input) => makeClassTrusted(self, input)), passthrough$1());
+	return new Transformation(transform$3((input) => makeClassTrusted(self, input)), passthrough$1());
 }
 function getClassTypeId(identifier) {
 	return `~effect/Schema/Class/${identifier}`;
@@ -42296,7 +42368,7 @@ function Array$1(value, pathOrOptions, options) {
 	const separator = resolvedOptions?.separator ?? ",";
 	return schema$1(Union([String$6.pipe(decodeTo(toCodecStringTree(array), {
 		decode: split(resolvedOptions),
-		encode: compose(passthrough$1({ strict: false }), transform$2((input) => input.join(separator)))
+		encode: compose(passthrough$1({ strict: false }), transform$3((input) => input.join(separator)))
 	})), array]), hasPath ? pathOrOptions : void 0);
 }
 function Record(key, value, pathOrOptions, options) {
@@ -45542,6 +45614,18 @@ const accessor = (method) => (...args) => flatMap$3(HttpClient, (client) => clie
 */
 const get$1 = /*#__PURE__*/ accessor("get");
 /**
+* Transforms a client by wrapping the response effect for each request.
+*
+* **Details**
+*
+* The transformation receives both the response effect and the original request, allowing it to change success, error, and environment behavior.
+*
+* @stability unstable
+* @category mapping
+* @since 4.0.0
+*/
+const transform$1 = /*#__PURE__*/ dual(2, (self, f) => makeWith(flatMap$3((request) => f(self.postprocess(succeed$5(request)), request)), self.preprocess));
+/**
 * Transforms a client by applying an effectful transformation to each response effect.
 *
 * @stability unstable
@@ -45695,6 +45779,77 @@ const retryTransient = /*#__PURE__*/ dual(2, (self, options) => {
 		times
 	})));
 });
+/**
+* Fails requests that do not receive a response within the given duration.
+*
+* **When to use**
+*
+* Use to configure a timeout once on the client, for example when providing
+* the `HttpClient` service, while keeping the standard `HttpClientError` error
+* model.
+*
+* **Details**
+*
+* A timed out request is interrupted and fails with an `HttpClientError` whose
+* reason is a `TransportError` with a `Cause.TimeoutError` cause.
+* `retryTransient` treats it as transient. Interrupting a request aborts the
+* underlying transport, unless the request is attached to a scope with
+* `withScope`, in which case it stays open until the scope closes.
+*
+* The timer starts after request preprocessing and covers everything the
+* wrapped client does to produce a response. For a plain client this ends when
+* the response headers arrive, but response middleware applied before
+* `timeout`, such as `tap` or `retryTransient`, runs inside the budget,
+* including any body reads it performs. Composition order therefore decides
+* how it interacts with retries: applying `timeout` before `retryTransient`
+* gives each attempt its own budget, while applying it after bounds the whole
+* retry loop.
+*
+* **Gotchas**
+*
+* Body reads outside the timed client are not covered, including those made
+* by response middleware applied after `timeout` and by consumers of the
+* `HttpClient` service. Apply a separate timeout to body reads such as
+* `response.json` or `response.stream` when needed.
+*
+* **Example** (Timing out each attempt)
+*
+* ```ts
+* import { Effect, Layer } from "effect"
+* import { FetchHttpClient, HttpClient } from "effect/http"
+*
+* const TimedHttpClient = Layer.effect(
+*   HttpClient.HttpClient,
+*   Effect.map(
+*     HttpClient.HttpClient,
+*     HttpClient.timeout("5 seconds")
+*   )
+* ).pipe(Layer.provide(FetchHttpClient.layer))
+*
+* const program = Effect.gen(function*() {
+*   const client = (yield* HttpClient.HttpClient).pipe(
+*     HttpClient.retryTransient({ times: 3 })
+*   )
+*   return yield* client.get("https://example.com")
+* }).pipe(Effect.provide(TimedHttpClient))
+* ```
+*
+* @stability unstable
+* @category error handling
+* @since 4.1.0
+*/
+const timeout = /*#__PURE__*/ dual(2, (self, duration) => {
+	const decoded = fromInputUnsafe$1(duration);
+	const description = `timed out after ${format$1(decoded)}`;
+	return transform$1(self, (effect, request) => timeoutOrElse(effect, {
+		duration: decoded,
+		orElse: () => fail$6(new HttpClientError({ reason: new TransportError({
+			request,
+			cause: new TimeoutError(`Operation ${description}`),
+			description
+		}) }))
+	}));
+});
 const parseRetryAfter = (nowMillis, value) => {
 	if (value === void 0) return;
 	const retryAfter = parseRetryAfter$1(value);
@@ -50386,7 +50541,7 @@ function withCycleGuard(target) {
 	return decodeTo(declareConstructor()([type], ([type]) => (input, ast, options) => {
 		if (isObjectOrArray(input) && decoded.delete(input)) return succeed$5(input);
 		return isCyclic(input) ? fail$6(new InvalidType(ast, input, options)) : decodeUnknownEffect$1(type)(input, options);
-	}, { identifier: "acyclic value" }), transform$1({
+	}, { identifier: "acyclic value" }), transform$2({
 		decode: (value) => {
 			if (isObjectOrArray(value)) decoded.add(value);
 			return value;
@@ -50714,20 +50869,6 @@ const Service = () => (id, options) => {
 	ServiceClass_.requiredForClient = options?.requiredForClient ?? false;
 	return ServiceClass;
 };
-/**
-* Provides the client-side implementation for an RPC middleware service,
-* capturing the layer's environment and merging it into each middleware
-* invocation.
-*
-* @stability unstable
-* @category layers
-* @since 4.0.0
-*/
-const layerClient = (tag, service) => effectContext(gen(function* () {
-	const services = (yield* context()).pipe(omit$1(Scope));
-	const middleware = isEffect(service) ? yield* service : service;
-	return makeUnsafe$9(/* @__PURE__ */ new Map([[`${tag.key}/Client`, (options) => updateContext(middleware(options), (requestContext) => merge$5(services, requestContext))]]));
-}));
 // ../../node_modules/.pnpm/effect@4.1.2/node_modules/effect/dist/http/FindMyWay/internal/queryString.js
 /**
 * @since 1.0.0
@@ -71210,7 +71351,7 @@ const Port = String$6.check(isPattern(/^\d{1,5}$/u), makeFilter((value) => exist
 const AppVersion = String$6.check(isPattern(/^0\.1\.\d+$/u));
 const RUNTIME_PATH = "/api/runtime";
 const RuntimeConfig = Struct({
-	auth: optionalKey(String$6),
+	auth: optionalKey(Origin),
 	name: String$6,
 	traces: String$6,
 	version: AppVersion
@@ -71910,8 +72051,9 @@ const SpanKind = {
 };
 // ../../packages/runtime/src/telemetry.ts
 function layerOtlp(serviceName, url, runtime, version) {
-	return unwrap$8(gen(function* () {
+	return pipe(unwrap$8(gen(function* () {
 		const start = `${yield* currentTimeNanos}`;
+		const redacted = yield* CurrentRedactedNames;
 		const resource = {
 			attributes: {
 				"scope.run.started_unix_nano": start,
@@ -71922,14 +72064,28 @@ function layerOtlp(serviceName, url, runtime, version) {
 			serviceVersion: getOrUndefined$1(liftPredicate(version, (current) => current !== "0.1.0"))
 		};
 		return pipe(mergeAll$1(layer({
-			exportInterval: "250 millis",
 			resource,
 			url: new URL("/v1/traces", url).href
 		}), layer$1({
-			exportInterval: "250 millis",
 			resource,
 			url: new URL("/v1/logs", url).href
-		})), provide$2([layerJson, layer$12]));
+		}), succeed$6(CurrentRedactedNames)([
+			...redacted,
+			"code",
+			"state",
+			"request",
+			"access_token",
+			"refresh_token",
+			"id_token",
+			"client_secret",
+			"client_assertion",
+			"code_verifier",
+			"session",
+			"token"
+		])), provide$2([layerJson, layer$12]));
+	})), catchCause$2((cause) => {
+		if (hasInterrupts(cause)) return effectDiscard(interrupt$1);
+		return effectDiscard(logWarning("Telemetry is unavailable"));
 	}));
 }
 // ../../packages/runtime/src/auth/lib/utils.ts
@@ -71946,15 +72102,15 @@ gen(function* () {
 	if (yield* localAuth) return yield* withDefault$2(listed, ["0"]);
 	return yield* listed;
 });
+function failureOptions(error, status) {
+	if (is$3(AuthError)(error) && error.error === "temporarily_unavailable") return {
+		headers: { "retry-after": "5" },
+		status: 503
+	};
+	return { status };
+}
 var CurrentUser = class extends Service$1()("@deslop/runtime/auth/lib/utils/CurrentUser") {};
-var RpcAuth = class RpcAuth extends Service()("@deslop/runtime/auth/lib/utils/RpcAuth", { error: AuthError }) {
-	static layerClient = (token) => layerClient(RpcAuth, (options) => gen(function* () {
-		return yield* options.next({
-			...options.request,
-			headers: set$1(options.request.headers, "authorization", `Bearer ${yield* token}`)
-		});
-	}));
-};
+var RpcAuth = class extends Service()("@deslop/runtime/auth/lib/utils/RpcAuth", { error: AuthError }) {};
 // ../../packages/runtime/src/auth/service.ts
 function rejected(message) {
 	return mapError$2((cause) => {
@@ -71978,7 +72134,10 @@ const unavailable = text$2("The authorization service is temporarily unavailable
 	status: 503
 });
 var Auth = class Auth extends Service$1()("@deslop/runtime/auth/service/Auth") {
-	static makeContext = (auth) => pipe(make$68(Auth, auth), add$2(RpcAuth, RpcAuth.of((effect, request) => pipe(auth.user(request.headers), flatMap$3((user) => raceFirst(provideService(effect, CurrentUser, user), pipe(delay(auth.user(request.headers), "5 minutes"), retry({ while: (error) => error.error === "temporarily_unavailable" }), forever)))))));
+	static makeContext = (auth) => pipe(make$68(Auth, auth), add$2(RpcAuth, RpcAuth.of((effect, request) => pipe(auth.user(request.headers), tap$1(() => {
+		if (isStreamSchema(request.rpc.successSchema)) return annotateCurrentSpan("rpc.stream", true);
+		return void_$1;
+	}), flatMap$3((user) => raceFirst(provideService(effect, CurrentUser, user), pipe(delay(auth.user(request.headers), "5 minutes"), retry({ while: (error) => error.error === "temporarily_unavailable" }), forever)))))));
 	static layer = effectContext(gen(function* () {
 		if (yield* localAuth) return Auth.makeContext(Auth.of({
 			access: developer,
@@ -71991,13 +72150,13 @@ var Auth = class Auth extends Service$1()("@deslop/runtime/auth/service/Auth") {
 			return yield* pipe(client.get(new URL(VERIFY_PATH, issuer).href, {
 				headers: { authorization: headers["authorization"] ?? "" },
 				urlParams: { resource: audience }
-			}), flatMap$3(schemaBodyJson(User)), timeout("10 seconds"));
+			}), flatMap$3(schemaBodyJson(User)), timeout$1("10 seconds"));
 		}, rejected("Sign in first"));
 		return Auth.makeContext(Auth.of({
 			access,
 			user: fn("Auth.user")(function* (headers) {
 				if (isSome(get$6(headers, "authorization"))) return yield* access(headers, canonical);
-				return yield* pipe(client.get(new URL(SESSION_PATH, issuer).href, { headers: { cookie: headers["cookie"] ?? "" } }), flatMap$3(schemaBodyJson(User)), timeout("10 seconds"));
+				return yield* pipe(client.get(new URL(SESSION_PATH, issuer).href, { headers: { cookie: headers["cookie"] ?? "" } }), flatMap$3(schemaBodyJson(User)), timeout$1("10 seconds"));
 			}, rejected("Sign in first"))
 		}));
 	}));
@@ -72044,7 +72203,7 @@ const dataDirectory = gen(function* () {
 	});
 	return directory;
 });
-fnUntraced(function* (name) {
+const tool = fnUntraced(function* (name) {
 	const fs = yield* FileSystem;
 	const path = yield* Path$1;
 	const version = (yield* packageMetadata).version;
@@ -72061,6 +72220,9 @@ fnUntraced(function* (name) {
 	yield* forEach$1(filter$4(yield* fs.readDirectory(tools), (entry) => entry !== version), (entry) => fs.remove(path.join(tools, entry), { recursive: true }), { concurrency: 1 });
 	return target;
 });
+var ToolPath = class extends Service$1()("@deslop/runtime/server/ToolPath") {
+	static layer = succeed$6(this, tool);
+};
 const guard = make$17((app) => gen(function* () {
 	const request = yield* HttpServerRequest;
 	const host = request.headers["host"] ?? "";
@@ -72094,7 +72256,7 @@ function layerKeyValueStore(directory) {
 				return pipe(gen(function* () {
 					if (isString$1(value)) yield* fs.writeFileString(`${target}.tmp`, value, { mode: 384 });
 					else yield* fs.writeFile(`${target}.tmp`, value, { mode: 384 });
-				}), andThen(fs.rename(`${target}.tmp`, target)), withPermit(writes), uninterruptible, mapError$2((cause) => new KeyValueStoreError({
+				}), andThen(fs.rename(`${target}.tmp`, target)), uninterruptible, withPermit(writes), mapError$2((cause) => new KeyValueStoreError({
 					cause,
 					key,
 					message: "Cannot save the value",
@@ -72104,8 +72266,16 @@ function layerKeyValueStore(directory) {
 		});
 	})), provide$2(layerFileSystem(directory)));
 }
-unwrap$8(map$6(dataDirectory, layerKeyValueStore));
-const layerProtocol = mergeAll$1(layerSchemaBinary(), succeed$6(MaxBodySize)(mebibytes(10)));
+const layerDataStore = unwrap$8(map$6(dataDirectory, layerKeyValueStore));
+const layerProtocol = mergeAll$1(layerSchemaBinary(), succeed$6(MaxBodySize)(mebibytes(10)), effect(TracerDisabledWhen, map$6(TracerDisabledWhen, (previous) => (request) => {
+	const path = headNonEmpty(split$1(request.url, "?"));
+	return previous(request) || path === "/api/rpc" && toLowerCase(request.headers["upgrade"] ?? "") === "websocket" || startsWith("/assets/")(path) || contains$1([
+		"/icon",
+		"/favicon.ico",
+		"/apple-touch-icon.png",
+		"/manifest.webmanifest"
+	], path);
+})));
 const layerTelemetry = unwrap$8(gen(function* () {
 	const metadata = yield* packageMetadata;
 	return match$8(yield* option(String$5("OTEL_URL")), {
@@ -72118,6 +72288,7 @@ const layerRoutes = use((router) => gen(function* () {
 	const canonical = new URL(yield* String$5("APP_URL")).origin;
 	const issuer = yield* option(String$5("AUTH_URL"));
 	const traces = yield* pipe(String$5("OTEL_URL"), withDefault$2(""));
+	const metadata = yield* cached(packageMetadata);
 	const toIssuer = fnUntraced(function* (search) {
 		const request = yield* HttpServerRequest;
 		const next = filter$5(liftThrowable(() => new URL(new URL(request.url, canonical).searchParams.get("next") ?? canonical, canonical))(), (url) => url.origin === canonical);
@@ -72133,21 +72304,22 @@ const layerRoutes = use((router) => gen(function* () {
 		});
 	});
 	yield* router.add("GET", RUNTIME_PATH, gen(function* () {
+		const release = yield* metadata;
 		return yield* schemaJson(RuntimeConfig)({
 			...match$8(issuer, {
 				onNone: () => ({}),
 				onSome: (origin) => ({ auth: origin })
 			}),
-			name: yield* appName,
+			name: replace("@deslop/", "")(release.name),
 			traces,
-			version: (yield* packageMetadata).version
+			version: release.version
 		});
 	}));
 	yield* router.add("GET", "/auth/sign-in", toIssuer({}));
 	yield* router.add("GET", "/auth/sign-out", toIssuer({ "sign-out": "" }));
 	yield* router.add("GET", "/auth/user", gen(function* () {
 		const user = yield* result(auth.user((yield* HttpServerRequest).headers));
-		if (isFailure$1(user)) return empty$1({ status: 401 });
+		if (isFailure$1(user)) return empty$1(failureOptions(user.failure, 401));
 		return yield* schemaJson(Account)({
 			...user.success,
 			signOut: isSome(issuer)
@@ -72156,14 +72328,14 @@ const layerRoutes = use((router) => gen(function* () {
 }));
 const layerAnnounce = effectDiscard(gen(function* () {
 	const origin = new URL(yield* String$5("APP_URL")).origin;
-	const client = filterStatusOk(yield* HttpClient);
+	const client = pipe(yield* HttpClient, filterStatusOk, timeout("10 seconds"), retryTransient({
+		schedule: spaced("1 minute"),
+		times: 60
+	}));
 	yield* match$8(yield* option(String$5("AUTH_URL")), {
 		onNone: () => void_$1,
 		onSome: fnUntraced(function* (issuer) {
-			yield* pipe(post(new URL(APPS_PATH, issuer).href), bodyJsonUnsafe({ origin }), client.execute, delay("2 seconds"), retry({
-				schedule: spaced("1 minute"),
-				times: 60
-			}), ignore$1({
+			yield* pipe(post(new URL(APPS_PATH, issuer).href), bodyJsonUnsafe({ origin }), client.execute, delay("2 seconds"), ignore$1({
 				log: "Warn",
 				message: "Auth did not list this app"
 			}), forkScoped);
@@ -72182,11 +72354,10 @@ const layerWeb = unwrap$8(gen(function* () {
 	if (!(yield* (yield* FileSystem).exists((yield* Path$1).join(client, "index.html")))) return empty$10;
 	const name = capitalize(yield* appName);
 	return mergeAll$1(add$1("GET", MANIFEST_PATH, succeed$5(jsonUnsafe({
-		background_color: "#0a0a0a",
+		background_color: "#0d0c0c",
 		display: "standalone",
 		icons: [{
 			purpose: "any",
-			sizes: "512x512",
 			src: "/apple-touch-icon.png",
 			type: "image/png"
 		}],
@@ -72195,7 +72366,7 @@ const layerWeb = unwrap$8(gen(function* () {
 		scope: "/",
 		short_name: name,
 		start_url: "/",
-		theme_color: "#0a0a0a"
+		theme_color: "#0d0c0c"
 	}, {
 		contentType: "application/manifest+json",
 		headers: { "cache-control": "no-cache" }
@@ -72244,7 +72415,7 @@ const execute = fnUntraced(function* (command, args) {
 	}, { concurrency: "unbounded" });
 	if (result.code !== 0) return yield* AppError.make({ message: `${command} failed: ${result.stderr}` });
 	return result.stdout;
-});
+}, scoped);
 function systemctl(...args) {
 	return execute("systemctl", ["--user", ...args]);
 }
@@ -72294,7 +72465,7 @@ function status(name) {
 	return systemctl("show", `deslop-${name}.service`, "--property=LoadState,ActiveState,SubState,MainPID");
 }
 function restart(name) {
-	return pipe(systemctl("restart", `deslop-${name}.service`), timeout("30 seconds"));
+	return pipe(systemctl("restart", `deslop-${name}.service`), timeout$1("30 seconds"));
 }
 // ../../packages/runtime/src/cli/update.ts
 const serviceDirectory = fnUntraced(function* (name) {
@@ -72318,7 +72489,7 @@ const update$1 = fnUntraced(function* (name) {
 	const path = yield* Path$1;
 	const root = yield* serviceDirectory(name);
 	const running = (yield* decodeEffect(fromJsonString(Struct({ version: AppVersion })))(yield* fs.readFileString(path.join(root, "current", "package.json")))).version;
-	const latest = (yield* pipe(filterStatusOk(yield* HttpClient).get(`https://registry.npmjs.org/@deslop%2f${name}/latest`), flatMap$3(schemaBodyJson(Struct({ version: AppVersion }))), timeout("15 seconds"))).version;
+	const latest = (yield* pipe(filterStatusOk(yield* HttpClient).get(`https://registry.npmjs.org/@deslop%2f${name}/latest`), flatMap$3(schemaBodyJson(Struct({ version: AppVersion }))), timeout$1("15 seconds"))).version;
 	if (latest === running) return `${name} ${running} is current\n`;
 	const npm = path.resolve(path.dirname(execPath), "../lib/node_modules/npm/bin/npm-cli.js");
 	if (!(yield* fs.exists(npm))) return yield* AppError.make({ message: "This Node runtime does not include npm; install Node with Vite+" });
@@ -72335,7 +72506,7 @@ const update$1 = fnUntraced(function* (name) {
 		"--prefer-online",
 		"--registry=https://registry.npmjs.org",
 		`@deslop/${name}@${latest}`
-	]), timeout("5 minutes"));
+	]), timeout$1("5 minutes"));
 	const previous = yield* option$1(fs.readLink(path.join(root, "current")));
 	yield* activate(name, path.join(directory, "node_modules", "@deslop", name));
 	yield* restart(name);
@@ -72344,6 +72515,7 @@ const update$1 = fnUntraced(function* (name) {
 	return `Updated ${name} from ${running} to ${latest}\n`;
 });
 // ../../packages/runtime/src/cli.ts
+const DEFAULT_HOST = "127.0.0.1";
 const SETTINGS = {
 	APP_URL: {
 		description: "Canonical origin, such as the HTTPS name a proxy serves",
@@ -72356,7 +72528,7 @@ const SETTINGS = {
 		schema: SecureOrigin
 	},
 	HOST: {
-		description: "Listen address; defaults to 127.0.0.1",
+		description: `Listen address; defaults to ${DEFAULT_HOST}`,
 		flag: "host",
 		schema: NonEmptyString
 	},
@@ -72364,23 +72536,18 @@ const SETTINGS = {
 		description: "Scope origin to export traces and logs to",
 		flag: "traces",
 		schema: Origin
-	},
-	PORT: {
-		description: "Listen port; defaults to the package's config.port",
-		flag: "port",
-		schema: Port
 	}
 };
 String$6.check(isPattern(/^\d+(?:,\d+)*$/u));
 function flagsOf(settings) {
-	return map$10(settings, (setting, key) => pipe(String$1(setting.flag), withSchema(setting.schema), withFallbackConfig(schema$1(setting.schema, key)), withDescription(setting.description), optional));
+	return map$10(settings, (setting, key) => pipe(String$1(setting.flag), withSchema(setting.schema), withFallbackConfig(schema$1(setting.schema, key)), withDescription(`${setting.description} [${key}]`), optional));
 }
-const provider = fnUntraced(function* (given) {
-	const port = given["PORT"] ?? `${(yield* packageMetadata).config.port}`;
+const provider = fnUntraced(function* (given, defaultPort) {
+	const port = given["PORT"] ?? `${defaultPort}`;
 	const url = given["APP_URL"] ?? `http://localhost:${port}`;
 	if (given["AUTH_URL"] !== void 0 && new URL(url).protocol !== "https:") return yield* AppError.make({ message: "With --auth, set --url to the app's HTTPS origin" });
 	return orElse(fromUnknown({
-		HOST: "127.0.0.1",
+		HOST: DEFAULT_HOST,
 		...given,
 		APP_URL: url,
 		PORT: port
@@ -72388,9 +72555,12 @@ const provider = fnUntraced(function* (given) {
 });
 const layerPlatform = mergeAll$1(layer$4, layer$12, layer$15);
 function server(app) {
-	return pipe(serve(pipe(mergeAll$1(app.routes, layerRoutes, layerIcon(app.icon), layerWeb, layerAnnounce), provide$2(Auth.layer)), {
+	return pipe(serve(pipe(mergeAll$1(app.routes, layerRoutes, layerIcon(app.icon), layerWeb, layerAnnounce), provide$2(match$8(fromUndefinedOr(app.middleware), {
+		onNone: () => empty$10,
+		onSome: (middleware$1) => middleware()(middleware$1).layer
+	})), provide$2(Auth.layer)), {
 		disableLogger: true,
-		middleware: (http) => guard(app.middleware?.(http) ?? http)
+		middleware: guard
 	}), provide$2(mergeAll$1(layerProtocol, match$1(app.telemetry === false, {
 		onFalse: () => layerTelemetry,
 		onTrue: () => empty$10
@@ -72400,21 +72570,26 @@ function output(text) {
 	return flatMap$3(Stdio, (stdio) => run$4(make$42(text), stdio.stdout()));
 }
 function runApp(app) {
-	const settings = {
-		...SETTINGS,
-		...app.settings
-	};
 	const program = gen(function* () {
 		const metadata = yield* packageMetadata;
 		const name = yield* appName;
+		const settings = {
+			...SETTINGS,
+			PORT: {
+				description: `Listen port; defaults to ${metadata.config.port}`,
+				flag: "port",
+				schema: Port
+			},
+			...app.settings
+		};
 		const root = pipe(make$5(name), withSharedFlags(flagsOf(settings)));
 		const given = map$6(root, (input) => getSomes$1(input));
-		return yield* pipe(root, withHandler((input) => flatMap$3(provider(getSomes$1(input)), (values) => provideService(server(app), ConfigProvider, values))), withSubcommands([pipe(make$5("service"), withSubcommands([
+		return yield* pipe(root, withHandler((input) => flatMap$3(provider(getSomes$1(input), metadata.config.port), (values) => provideService(server(app), ConfigProvider, values))), withSubcommands([pipe(make$5("service"), withSubcommands([
 			make$5("install", {}, fnUntraced(function* () {
 				const fs = yield* FileSystem;
 				const path = yield* Path$1;
 				const flags = yield* given;
-				yield* provider(flags);
+				yield* provider(flags, metadata.config.port);
 				const entry = path.join(yield* activate(name, yield* fs.realPath(packageRoot)), "dist", "server.js");
 				const args = flatten$4(collect$1(flags, (key, value) => [`--${settings[key]?.flag ?? key}`, value]));
 				yield* output(yield* install(name, [
@@ -72437,7 +72612,7 @@ function runApp(app) {
 	runMain(pipe(program, scoped, provide(layerPlatform), provideService(LogToStderr, true)));
 }
 // src/routes/icon.svg
-var icon_default = "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 64 64\" shape-rendering=\"crispEdges\"><path fill=\"#deb49a\" d=\"M21 11h1v1h-1zM22 12h2v1h-2zM24 13h2v1h-2zM15 14h1v28h-1zM26 14h2v1h-2zM16 15h2v28h-2zM28 15h2v1h-2zM18 16h2v28h-2zM30 16h2v1h-2zM20 17h2v8h-2zM32 17h2v1h-2zM22 18h2v5h-2zM34 18h2v1h-2zM24 19h2v5h-2zM36 19h2v1h-2zM26 20h2v9h-2zM38 20h2v1h-2zM28 21h2v9h-2zM40 21h2v1h-2zM30 22h2v9h-2zM42 22h2v1h-2zM32 23h2v5h-2zM44 23h2v1h-2zM22 24h2v2h-2zM34 24h2v5h-2zM46 24h1v28h-1zM20 25h1v1h-1zM24 25h2v2h-2zM36 25h2v5h-2zM38 26h2v28h-2zM40 27h1v28h-1zM32 28h1v3h-1zM20 29h1v16h-1zM27 29h1v11h-1zM33 29h1v2h-1zM21 30h1v15h-1zM28 30h1v7h-1zM34 30h2v2h-2zM37 30h1v4h-1zM22 31h2v15h-2zM30 31h1v7h-1zM36 31h1v2h-1zM24 32h3v8h-3zM31 34h1v8h-1zM32 36h2v7h-2zM34 37h2v15h-2zM37 37h1v16h-1zM28 38h2v3h-2zM36 38h1v15h-1zM30 39h1v3h-1zM24 40h2v7h-2zM26 42h1v6h-1zM27 43h1v5h-1zM33 43h1v8h-1zM28 45h2v4h-2zM31 45h2v5h-2zM30 46h1v4h-1zM32 50h1v1h-1z\"/><path fill=\"#0a0a0a\" d=\"M22 9h2v1h-2zM21 10h1v1h-1zM24 10h2v1h-2zM20 11h1v1h-1zM26 11h2v1h-2zM16 12h4v1h-4zM28 12h2v1h-2zM15 13h1v1h-1zM30 13h2v1h-2zM14 14h1v28h-1zM32 14h2v1h-2zM34 15h2v1h-2zM36 16h2v1h-2zM38 17h2v1h-2zM40 18h2v1h-2zM42 19h2v1h-2zM44 20h2v1h-2zM46 21h2v1h-2zM48 22h1v1h-1zM49 23h1v28h-1zM15 42h1v1h-1zM16 43h2v1h-2zM18 44h2v1h-2zM20 45h2v1h-2zM22 46h2v1h-2zM24 47h2v1h-2zM26 48h2v1h-2zM28 49h2v1h-2zM30 50h2v1h-2zM32 51h2v1h-2zM44 51h2v1h-2zM48 51h1v1h-1zM34 52h2v1h-2zM43 52h1v2h-1zM46 52h2v1h-2zM36 53h2v1h-2zM38 54h2v1h-2zM42 54h1v1h-1zM40 55h2v1h-2z\"/><path fill=\"#c49678\" d=\"M48 23h1v28h-1zM47 24h1v28h-1zM42 26h1v28h-1zM41 27h1v28h-1z\"/><path fill=\"#fffcf0\" d=\"M20 12h2v3h-2zM18 13h2v1h-2zM22 13h2v3h-2zM24 14h2v3h-2zM26 15h2v3h-2zM28 16h2v3h-2zM30 17h2v3h-2zM32 18h2v3h-2zM34 19h2v3h-2zM36 20h2v3h-2zM38 21h2v3h-2zM40 22h2v3h-2zM42 23h2v3h-2zM44 24h2v1h-2zM21 26h1v3h-1zM22 27h2v3h-2zM24 28h2v1h-2zM25 29h1v2h-1zM24 30h1v1h-1zM32 32h2v1h-2zM32 33h1v2h-1zM34 33h2v3h-2zM33 34h1v1h-1zM36 34h1v3h-1z\"/><path fill=\"#2a211c\" d=\"M22 23h2v1h-2zM24 24h2v1h-2zM21 25h1v1h-1zM20 26h1v3h-1zM22 26h2v1h-2zM24 27h2v1h-2zM33 28h1v1h-1zM21 29h1v1h-1zM24 29h1v1h-1zM26 29h1v3h-1zM34 29h2v1h-2zM22 30h2v1h-2zM36 30h1v1h-1zM24 31h2v1h-2zM31 31h3v1h-3zM31 32h1v2h-1zM34 32h2v1h-2zM33 33h1v1h-1zM36 33h1v1h-1zM37 34h1v3h-1zM32 35h2v1h-2zM34 36h2v1h-2zM36 37h1v1h-1zM26 40h2v1h-2zM26 41h1v1h-1zM28 41h2v1h-2zM27 42h1v1h-1zM30 42h2v1h-2zM32 43h1v2h-1zM28 44h2v1h-2zM31 44h1v1h-1zM30 45h1v1h-1z\"/><path fill=\"#ecc9b2\" d=\"M22 10h2v1h-2zM24 11h2v1h-2zM26 12h2v1h-2zM16 13h2v1h-2zM28 13h2v1h-2zM18 14h2v1h-2zM30 14h2v1h-2zM20 15h2v1h-2zM32 15h2v1h-2zM22 16h2v1h-2zM34 16h2v1h-2zM24 17h2v1h-2zM36 17h2v1h-2zM26 18h2v1h-2zM38 18h2v1h-2zM28 19h2v1h-2zM40 19h2v1h-2zM30 20h2v1h-2zM42 20h2v1h-2zM32 21h2v1h-2zM44 21h2v1h-2zM34 22h2v1h-2zM46 22h2v1h-2zM36 23h2v1h-2zM38 24h2v1h-2zM40 25h2v1h-2z\"/><path fill=\"#f1d6c5\" d=\"M22 11h2v1h-2zM24 12h2v1h-2zM26 13h2v1h-2zM16 14h2v1h-2zM28 14h2v1h-2zM18 15h2v1h-2zM30 15h2v1h-2zM20 16h2v1h-2zM32 16h2v1h-2zM22 17h2v1h-2zM34 17h2v1h-2zM24 18h2v1h-2zM36 18h2v1h-2zM26 19h2v1h-2zM38 19h2v1h-2zM28 20h2v1h-2zM40 20h2v1h-2zM30 21h2v1h-2zM42 21h2v1h-2zM32 22h2v1h-2zM44 22h2v1h-2zM34 23h2v1h-2zM46 23h2v1h-2zM36 24h2v1h-2zM38 25h2v1h-2zM40 26h2v1h-2z\"/><path fill=\"#dad8ce\" d=\"M44 25h2v1h-2zM43 26h1v1h-1zM44 27h2v1h-2zM43 28h1v1h-1zM44 29h2v1h-2zM43 30h1v1h-1zM44 31h2v1h-2zM43 32h1v1h-1zM44 33h2v1h-2zM43 34h1v1h-1zM44 35h2v1h-2zM43 36h1v1h-1zM44 37h2v1h-2zM43 38h1v1h-1zM44 39h2v1h-2zM43 40h1v1h-1zM44 41h2v1h-2zM43 42h1v1h-1zM44 43h2v1h-2zM43 44h1v1h-1zM44 45h2v1h-2zM43 46h1v1h-1zM44 47h2v1h-2zM43 48h1v1h-1zM44 49h2v1h-2zM43 50h1v1h-1z\"/><path fill=\"#f2f0e5\" d=\"M44 26h2v1h-2zM43 27h1v1h-1zM44 28h2v1h-2zM43 29h1v1h-1zM44 30h2v1h-2zM43 31h1v1h-1zM44 32h2v1h-2zM43 33h1v1h-1zM44 34h2v1h-2zM43 35h1v1h-1zM44 36h2v1h-2zM43 37h1v1h-1zM44 38h2v1h-2zM43 39h1v1h-1zM44 40h2v1h-2zM43 41h1v1h-1zM44 42h2v1h-2zM43 43h1v1h-1zM44 44h2v1h-2zM43 45h1v1h-1zM44 46h2v1h-2zM43 47h1v1h-1zM44 48h2v1h-2zM43 49h1v1h-1zM44 50h2v1h-2zM43 51h1v1h-1z\"/><path fill=\"#000000\" fill-opacity=\"0.353\" d=\"M17 44h1v1h-1zM18 45h2v1h-2zM20 46h2v1h-2zM22 47h2v1h-2zM24 48h2v1h-2zM26 49h2v1h-2zM28 50h2v1h-2zM30 51h2v1h-2zM32 52h2v1h-2zM34 53h2v1h-2zM36 54h2v1h-2zM38 55h2v1h-2zM40 56h1v1h-1z\"/><path fill=\"#a77457\" d=\"M29 30h1v8h-1zM28 37h1v1h-1zM30 38h1v1h-1z\"/><path fill=\"#c98481\" d=\"M27 41h1v1h-1zM28 42h2v2h-2zM30 43h2v1h-2zM30 44h1v1h-1z\"/></svg>\n";
+var icon_default = "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 64 64\" shape-rendering=\"crispEdges\"><path fill=\"#000\" fill-opacity=\".18\" d=\"M12 40h1v1h-1zM10 41h3v1h-3zM8 42h4v1h-4zM10 43h4v1h-4zM12 44h4v1h-4zM14 45h4v1h-4zM16 46h4v1h-4zM18 47h4v1h-4zM20 48h4v1h-4zM51 48h1v1h-1zM22 49h4v1h-4zM51 49h3v1h-3zM24 50h4v1h-4zM52 50h4v1h-4zM26 51h4v1h-4zM50 51h4v1h-4zM28 52h4v1h-4zM44 52h8v1h-8zM30 53h4v1h-4zM43 53h7v1h-7zM32 54h4v1h-4zM44 54h4v1h-4zM34 55h4v1h-4zM42 55h4v1h-4zM36 56h8v1h-8zM38 57h4v1h-4z\"/><path fill=\"#000\" fill-opacity=\".38\" d=\"M12 42h2v1h-2zM14 43h1v1h-1zM16 44h1v1h-1zM18 45h1v1h-1zM20 46h1v1h-1zM22 47h1v1h-1zM24 48h1v1h-1zM26 49h1v1h-1zM28 50h1v1h-1zM50 50h2v1h-2zM30 51h1v1h-1zM45 51h2v1h-2zM49 51h1v1h-1zM32 52h1v1h-1zM43 52h1v1h-1zM34 53h1v1h-1zM36 54h1v1h-1zM42 54h2v1h-2zM38 55h1v1h-1zM41 55h1v1h-1z\"/><path fill=\"#7a5d4c\" d=\"M23 8h2v1h-2zM21 9h2v1h-2zM25 9h2v1h-2zM19 10h2v1h-2zM27 10h2v1h-2zM17 11h2v1h-2zM29 11h2v1h-2zM15 12h2v1h-2zM23 12h1v1h-1zM31 12h2v1h-2zM14 13h1v1h-1zM21 13h2v1h-2zM33 13h2v1h-2zM13 14h1v1h-1zM19 14h2v1h-2zM35 14h2v1h-2zM13 15h1v1h-1zM37 15h2v1h-2zM13 16h1v1h-1zM39 16h2v1h-2zM13 17h1v1h-1zM41 17h2v1h-2zM13 18h1v1h-1zM43 18h2v1h-2zM13 19h1v1h-1zM45 19h2v1h-2zM13 20h1v1h-1zM47 20h2v1h-2zM13 21h1v1h-1zM49 21h1v1h-1zM13 22h1v1h-1zM50 22h1v1h-1zM13 23h1v1h-1zM50 23h1v1h-1zM13 24h1v1h-1zM50 24h1v1h-1zM13 25h1v1h-1zM50 25h1v1h-1zM13 26h1v1h-1zM50 26h1v1h-1zM13 27h1v1h-1zM50 27h1v1h-1zM13 28h1v1h-1zM50 28h1v1h-1zM13 29h1v1h-1zM50 29h1v1h-1zM13 30h1v1h-1zM50 30h1v1h-1zM13 31h1v1h-1zM50 31h1v1h-1zM13 32h1v1h-1zM50 32h1v1h-1zM13 33h1v1h-1zM50 33h1v1h-1zM13 34h1v1h-1zM50 34h1v1h-1zM13 35h1v1h-1zM50 35h1v1h-1zM13 36h1v1h-1zM50 36h1v1h-1zM13 37h1v1h-1zM50 37h1v1h-1zM13 38h1v1h-1zM50 38h1v1h-1zM13 39h1v1h-1zM50 39h1v1h-1zM13 40h1v1h-1zM50 40h1v1h-1zM13 41h1v1h-1zM50 41h1v1h-1zM14 42h1v1h-1zM50 42h1v1h-1zM15 43h2v1h-2zM50 43h1v1h-1zM17 44h2v1h-2zM50 44h1v1h-1zM19 45h2v1h-2zM50 45h1v1h-1zM21 46h2v1h-2zM50 46h1v1h-1zM23 47h2v1h-2zM50 47h1v1h-1zM25 48h2v1h-2zM50 48h1v1h-1zM27 49h2v1h-2zM49 49h2v1h-2zM29 50h2v1h-2zM46 50h1v1h-1zM48 50h2v1h-2zM31 51h2v1h-2zM47 51h2v1h-2zM33 52h2v1h-2zM35 53h2v1h-2zM41 53h2v1h-2zM37 54h2v1h-2zM40 54h2v1h-2zM39 55h2v1h-2z\"/><path fill=\"#f3d1b7\" d=\"M23 9h2v1h-2zM21 10h3v1h-3zM25 10h2v1h-2zM19 11h2v1h-2zM27 11h2v1h-2zM17 12h2v1h-2zM29 12h2v1h-2zM15 13h4v1h-4zM31 13h2v1h-2zM17 14h2v1h-2zM33 14h2v1h-2zM19 15h2v1h-2zM35 15h2v1h-2zM21 16h2v1h-2zM37 16h2v1h-2zM23 17h2v1h-2zM39 17h2v1h-2zM25 18h2v1h-2zM41 18h2v1h-2zM27 19h2v1h-2zM43 19h2v1h-2zM29 20h2v1h-2zM45 20h2v1h-2zM31 21h2v1h-2zM47 21h2v1h-2zM33 22h2v1h-2zM35 23h2v1h-2zM47 23h1v1h-1zM37 24h2v1h-2zM47 24h1v1h-1zM39 25h2v1h-2zM47 25h1v1h-1zM47 26h1v1h-1zM39 27h1v1h-1zM47 27h1v1h-1zM39 28h1v1h-1zM47 28h1v1h-1zM39 29h1v1h-1zM47 29h1v1h-1zM39 30h1v1h-1zM47 30h1v1h-1zM39 31h1v1h-1zM47 31h1v1h-1zM39 32h1v1h-1zM47 32h1v1h-1zM39 33h1v1h-1zM47 33h1v1h-1zM39 34h1v1h-1zM47 34h1v1h-1zM39 35h1v1h-1zM47 35h1v1h-1zM39 36h1v1h-1zM47 36h1v1h-1zM39 37h1v1h-1zM47 37h1v1h-1zM39 38h1v1h-1zM47 38h1v1h-1zM39 39h1v1h-1zM47 39h1v1h-1zM39 40h1v1h-1zM47 40h1v1h-1zM39 41h1v1h-1zM47 41h1v1h-1zM39 42h1v1h-1zM47 42h1v1h-1zM39 43h1v1h-1zM47 43h1v1h-1zM39 44h1v1h-1zM47 44h1v1h-1zM39 45h1v1h-1zM47 45h1v1h-1zM39 46h1v1h-1zM47 46h1v1h-1zM39 47h1v1h-1zM47 47h1v1h-1zM39 48h1v1h-1zM47 48h1v1h-1zM39 49h1v1h-1zM47 49h1v1h-1zM39 50h1v1h-1zM39 51h1v1h-1zM39 52h1v1h-1zM39 53h1v1h-1z\"/><path fill=\"#fee7d5\" d=\"M24 10h1v1h-1zM21 11h2v1h-2zM25 11h2v1h-2zM19 12h2v1h-2zM27 12h2v1h-2zM29 13h2v1h-2zM15 14h2v1h-2zM31 14h2v1h-2zM17 15h2v1h-2zM33 15h2v1h-2zM19 16h2v1h-2zM35 16h2v1h-2zM21 17h2v1h-2zM37 17h2v1h-2zM23 18h2v1h-2zM39 18h2v1h-2zM25 19h2v1h-2zM41 19h2v1h-2zM27 20h2v1h-2zM43 20h2v1h-2zM29 21h2v1h-2zM45 21h2v1h-2zM31 22h2v1h-2zM47 22h2v1h-2zM33 23h2v1h-2zM35 24h2v1h-2zM37 25h2v1h-2zM39 26h2v1h-2z\"/><path fill=\"#b38d74\" d=\"M23 11h1v1h-1zM21 12h2v1h-2zM19 13h2v1h-2zM49 22h1v1h-1zM48 23h2v1h-2zM48 24h2v1h-2zM48 25h2v1h-2zM41 26h1v1h-1zM48 26h2v1h-2zM40 27h2v1h-2zM48 27h2v1h-2zM40 28h2v1h-2zM48 28h2v1h-2zM40 29h2v1h-2zM48 29h2v1h-2zM40 30h2v1h-2zM48 30h2v1h-2zM40 31h2v1h-2zM48 31h2v1h-2zM40 32h2v1h-2zM48 32h2v1h-2zM40 33h2v1h-2zM48 33h2v1h-2zM40 34h2v1h-2zM48 34h2v1h-2zM40 35h2v1h-2zM48 35h2v1h-2zM40 36h2v1h-2zM48 36h2v1h-2zM40 37h2v1h-2zM48 37h2v1h-2zM40 38h2v1h-2zM48 38h2v1h-2zM40 39h2v1h-2zM48 39h2v1h-2zM40 40h2v1h-2zM48 40h2v1h-2zM40 41h2v1h-2zM48 41h2v1h-2zM40 42h2v1h-2zM48 42h2v1h-2zM40 43h2v1h-2zM48 43h2v1h-2zM40 44h2v1h-2zM48 44h2v1h-2zM40 45h2v1h-2zM48 45h2v1h-2zM40 46h2v1h-2zM48 46h2v1h-2zM40 47h2v1h-2zM48 47h2v1h-2zM40 48h2v1h-2zM48 48h2v1h-2zM40 49h2v1h-2zM48 49h1v1h-1zM40 50h2v1h-2zM40 51h2v1h-2zM40 52h2v1h-2zM40 53h1v1h-1z\"/><path fill=\"#E4BC9E\" d=\"M24 11h1v1h-1zM25 12h2v1h-2zM27 13h2v1h-2zM14 14h1v1h-1zM29 14h2v1h-2zM14 15h3v1h-3zM31 15h2v1h-2zM14 16h5v1h-5zM33 16h2v1h-2zM14 17h7v1h-7zM35 17h2v1h-2zM14 18h9v1h-9zM37 18h2v1h-2zM14 19h11v1h-11zM39 19h2v1h-2zM14 20h13v1h-13zM41 20h2v1h-2zM14 21h15v1h-15zM43 21h2v1h-2zM14 22h17v1h-17zM45 22h2v1h-2zM14 23h7v1h-7zM23 23h10v1h-10zM46 23h1v1h-1zM14 24h9v1h-9zM25 24h10v1h-10zM46 24h1v1h-1zM14 25h6v1h-6zM21 25h16v1h-16zM46 25h1v1h-1zM14 26h5v1h-5zM23 26h16v1h-16zM46 26h1v1h-1zM14 27h5v1h-5zM25 27h14v1h-14zM46 27h1v1h-1zM14 28h5v1h-5zM25 28h7v1h-7zM33 28h6v1h-6zM46 28h1v1h-1zM14 29h6v1h-6zM26 29h7v1h-7zM35 29h4v1h-4zM46 29h1v1h-1zM14 30h7v1h-7zM26 30h2v1h-2zM29 30h6v1h-6zM36 30h3v1h-3zM46 30h1v1h-1zM14 31h9v1h-9zM26 31h2v1h-2zM29 31h1v1h-1zM33 31h6v1h-6zM46 31h1v1h-1zM14 32h14v1h-14zM29 32h1v1h-1zM35 32h4v1h-4zM46 32h1v1h-1zM14 33h14v1h-14zM29 33h1v1h-1zM36 33h3v1h-3zM46 33h1v1h-1zM14 34h14v1h-14zM29 34h2v1h-2zM37 34h2v1h-2zM46 34h1v1h-1zM14 35h14v1h-14zM29 35h2v1h-2zM37 35h2v1h-2zM46 35h1v1h-1zM14 36h14v1h-14zM29 36h4v1h-4zM37 36h2v1h-2zM46 36h1v1h-1zM14 37h13v1h-13zM29 37h6v1h-6zM36 37h3v1h-3zM46 37h1v1h-1zM14 38h15v1h-15zM30 38h9v1h-9zM46 38h1v1h-1zM14 39h11v1h-11zM27 39h12v1h-12zM46 39h1v1h-1zM14 40h11v1h-11zM29 40h10v1h-10zM46 40h1v1h-1zM15 41h11v1h-11zM31 41h8v1h-8zM46 41h1v1h-1zM17 42h10v1h-10zM32 42h7v1h-7zM46 42h1v1h-1zM19 43h8v1h-8zM32 43h7v1h-7zM46 43h1v1h-1zM21 44h8v1h-8zM30 44h9v1h-9zM46 44h1v1h-1zM23 45h16v1h-16zM46 45h1v1h-1zM25 46h14v1h-14zM46 46h1v1h-1zM27 47h12v1h-12zM46 47h1v1h-1zM29 48h10v1h-10zM46 48h1v1h-1zM31 49h8v1h-8zM33 50h6v1h-6zM35 51h4v1h-4zM37 52h2v1h-2z\"/><path fill=\"#cca68b\" d=\"M24 12h1v1h-1zM25 13h2v1h-2zM27 14h2v1h-2zM29 15h2v1h-2zM31 16h2v1h-2zM33 17h2v1h-2zM35 18h2v1h-2zM37 19h2v1h-2zM39 20h2v1h-2zM41 21h2v1h-2zM43 22h2v1h-2zM45 23h1v1h-1zM14 41h1v1h-1zM15 42h2v1h-2zM17 43h2v1h-2zM19 44h2v1h-2zM21 45h2v1h-2zM23 46h2v1h-2zM25 47h2v1h-2zM27 48h2v1h-2zM29 49h2v1h-2zM46 49h1v1h-1zM31 50h2v1h-2zM47 50h1v1h-1zM33 51h2v1h-2zM35 52h2v1h-2zM37 53h2v1h-2zM39 54h1v1h-1z\"/><path fill=\"#f9f5e6\" d=\"M23 13h2v1h-2zM21 14h6v1h-6zM21 15h8v1h-8zM23 16h8v1h-8zM25 17h8v1h-8zM27 18h8v1h-8zM29 19h8v1h-8zM31 20h8v1h-8zM33 21h8v1h-8zM35 22h8v1h-8zM37 23h8v1h-8zM39 24h6v1h-6zM41 25h2v1h-2z\"/><path fill=\"#2A211C\" d=\"M21 23h2v1h-2zM23 24h2v1h-2zM20 25h1v1h-1zM19 26h1v1h-1zM21 26h2v1h-2zM19 27h1v1h-1zM23 27h2v1h-2zM19 28h1v1h-1zM32 28h1v1h-1zM20 29h1v1h-1zM23 29h1v1h-1zM25 29h1v1h-1zM33 29h2v1h-2zM21 30h2v1h-2zM25 30h1v1h-1zM35 30h1v1h-1zM23 31h3v1h-3zM30 31h3v1h-3zM30 32h1v1h-1zM33 32h2v1h-2zM30 33h1v1h-1zM32 33h1v1h-1zM35 33h1v1h-1zM36 34h1v1h-1zM31 35h2v1h-2zM36 35h1v1h-1zM33 36h2v1h-2zM36 36h1v1h-1zM35 37h1v1h-1zM25 39h2v1h-2zM25 40h1v1h-1zM27 40h2v1h-2zM26 41h1v1h-1zM29 41h2v1h-2zM31 42h1v1h-1zM27 43h2v1h-2zM30 43h2v1h-2zM29 44h1v1h-1z\"/><path fill=\"#c0bdad\" d=\"M45 24h1v1h-1zM43 25h3v1h-3zM42 26h4v1h-4zM42 27h4v1h-4zM42 28h4v1h-4zM42 29h4v1h-4zM42 30h4v1h-4zM42 31h4v1h-4zM42 32h4v1h-4zM42 33h4v1h-4zM42 34h4v1h-4zM42 35h4v1h-4zM42 36h4v1h-4zM42 37h4v1h-4zM42 38h4v1h-4zM42 39h4v1h-4zM42 40h4v1h-4zM42 41h4v1h-4zM42 42h4v1h-4zM42 43h4v1h-4zM42 44h4v1h-4zM42 45h4v1h-4zM42 46h4v1h-4zM42 47h4v1h-4zM42 48h4v1h-4zM42 49h4v1h-4zM42 50h3v1h-3zM42 51h1v1h-1z\"/><path fill=\"#FFFCF0\" d=\"M20 26h1v1h-1zM20 27h3v1h-3zM20 28h5v1h-5zM21 29h2v1h-2zM24 29h1v1h-1zM23 30h2v1h-2zM31 32h2v1h-2zM31 33h1v1h-1zM33 33h2v1h-2zM31 34h5v1h-5zM33 35h3v1h-3zM35 36h1v1h-1z\"/><path fill=\"#A77457\" d=\"M28 30h1v1h-1zM28 31h1v1h-1zM28 32h1v1h-1zM28 33h1v1h-1zM28 34h1v1h-1zM28 35h1v1h-1zM28 36h1v1h-1zM27 37h2v1h-2zM29 38h1v1h-1z\"/><path fill=\"#C98481\" d=\"M26 40h1v1h-1zM27 41h2v1h-2zM27 42h4v1h-4zM29 43h1v1h-1z\"/><path fill=\"#8b897c\" d=\"M45 50h1v1h-1zM43 51h2v1h-2zM42 52h1v1h-1z\"/></svg>";
 // src/services/chapters/schema.ts
 var ChaptersError = class extends TaggedError()("ChaptersError", {
 	cause: optional$2(Defect()),
@@ -119276,12 +119451,12 @@ var require_mime_type = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 require_undici();
 require_mime_type();
 // src/services/chapters/lib/store.ts
-const failed$1 = mapError$2((cause) => ChaptersError.make({
+const failed = mapError$2((cause) => ChaptersError.make({
 	cause,
 	message: "The chapter storage failed."
 }));
-const openStore = fnUntraced(function* (directory) {
-	const store = get$10(yield* build(layerKeyValueStore(directory)), KeyValueStore);
+const openStore = fnUntraced(function* () {
+	const store = yield* KeyValueStore;
 	const chapters = toSchemaStore(store, ArraySchema(Chapter));
 	const devices = toSchemaStore(store, ArraySchema(PushToken));
 	const tokens = yield* make$34(copy$3(getOrElse(yield* devices.get("devices"), () => [])));
@@ -119289,16 +119464,16 @@ const openStore = fnUntraced(function* (directory) {
 		return pipe(updateEffect$1(tokens, (current) => {
 			const next = update(current);
 			return as(devices.set("devices", next), next);
-		}), uninterruptible, failed$1);
+		}), uninterruptible, failed);
 	}
 	return {
 		addDevice: (token) => updateDevices((current) => dedupe([...current, token])),
 		devices: get$3(tokens),
-		load: pipe(chapters.get("chapters"), map$6(getOrElse(() => [])), failed$1),
+		load: pipe(chapters.get("chapters"), map$6(getOrElse(() => [])), failed),
 		removeDevice: (token) => updateDevices((current) => filter$4(current, (saved) => saved !== token)),
-		save: (current) => pipe(chapters.set("chapters", current), failed$1)
+		save: (current) => pipe(chapters.set("chapters", current), failed)
 	};
-}, failed$1);
+}, failed);
 // src/services/chapters/lib/utils.ts
 const TITLE = /^(?<tags>(?:\[[^\]]*\]\s*)*)Chapter\s+(?<number>\d+(?:\.\d+)?)(?:\/\d+)?\s*\[(?:English|Translations)\]/iu;
 const CUBARI = /https:\/\/cubari\.moe\/read\/(?<source>imgchest|imgur|gist)\/(?<slug>[\w-]+)(?:\/(?<chapter>[\d.]+))?/u;
@@ -119403,12 +119578,6 @@ const ARCHIVE_POSTS = map$9([
 	series: release.series
 }));
 const newestFirst = flip$1(byNumber);
-function failed(message) {
-	return mapError$2((cause) => ChaptersError.make({
-		cause,
-		message
-	}));
-}
 function indexUrl(series) {
 	return `https://cubari.moe/read/gist/${INDEXES[series]}/`;
 }
@@ -119431,15 +119600,16 @@ function postsOf(feed) {
 	})), getSomes);
 }
 var Chapters = class Chapters extends Service$1()("@deslop/opm/services/chapters/service/Chapters") {
-	static layer = (directory) => effect(this, gen(function* () {
+	static layer = effect(this, gen(function* () {
 		const client = yield* HttpClient;
-		const exit = yield* pipe(option(String$5("OPM_PROXY")), failed("OPM_PROXY is unreadable."));
-		const store = yield* openStore(directory);
+		const exit = yield* option(String$5("OPM_PROXY"));
+		const store = yield* openStore();
 		const state = yield* make$32(sort(yield* store.load, newestFirst));
 		function series(url) {
-			return pipe(client.get(url, { headers: { "user-agent": BROWSER } }), flatMap$3(filterStatusOk$1), flatMap$3(schemaBodyJson(CubariSeries)), timeout("20 seconds"), retry({
+			return pipe(client.get(url, { headers: { "user-agent": BROWSER } }), flatMap$3(filterStatusOk$1), flatMap$3(schemaBodyJson(CubariSeries)), timeout$1("20 seconds"), retry({
 				schedule: exponential("1 second"),
-				times: 2
+				times: 2,
+				while: isTransientError
 			}));
 		}
 		const resolve = fnUntraced(function* (post, link) {
@@ -119496,7 +119666,7 @@ var Chapters = class Chapters extends Service$1()("@deslop/opm/services/chapters
 			});
 			const feeds = yield* forEach$1(FEEDS, (url) => pipe(gen(function* () {
 				const session = `${yield* nextIntBetween(1e7, 99999999)}`;
-				return yield* pipe(get$1(url, { headers: { "user-agent": BROWSER } }), flatMap$3(filterStatusOk$1), flatMap$3((response) => response.text), timeout("20 seconds"), provide(match$8(exit, {
+				return yield* pipe(get$1(url, { headers: { "user-agent": BROWSER } }), flatMap$3(filterStatusOk$1), flatMap$3((response) => response.text), timeout$1("20 seconds"), provide(match$8(exit, {
 					onNone: () => succeed$6(HttpClient, client),
 					onSome: (proxy) => pipe(layerNodeHttpNoAgent, provide$2(layerAgentOptions({ proxyEnv: {
 						HTTP_PROXY: replaceAll("{session}", session)(proxy),
@@ -119550,7 +119720,7 @@ var Chapters = class Chapters extends Service$1()("@deslop/opm/services/chapters
 				threadId: chapter.series,
 				title: `${SERIES_NAMES[chapter.series]} · Chapter ${chapter.number}`,
 				to
-			}))), flatMap$3((request) => client.execute(request)), flatMap$3(filterStatusOk$1), flatMap$3(schemaBodyJson(PushTickets)), timeout("20 seconds"));
+			}))), flatMap$3((request) => client.execute(request)), flatMap$3(filterStatusOk$1), flatMap$3(schemaBodyJson(PushTickets.check(makeFilter((received) => received.data.length === tokens.length, { message: "Expo must return exactly one ticket per message" })))), timeout$1("20 seconds"));
 			const tickets = zip(tokens, answer.data);
 			yield* forEach$1(filter$4(tickets, (pair) => pair[1].details?.error === "DeviceNotRegistered"), (pair) => store.removeDevice(pair[0]), {
 				concurrency: 1,
@@ -119580,7 +119750,7 @@ var Chapters = class Chapters extends Service$1()("@deslop/opm/services/chapters
 		yield* forkScoped(repeat(pipe(sync, ignore$1({
 			log: "Warn",
 			message: "The chapter sync failed"
-		}), andThen(notify)), spaced("6 hours")));
+		}), andThen(notify), withSpan("Chapters.sync")), spaced("6 hours")));
 		return Chapters.of({
 			changes: pipe(changes(state), mapAccum(() => none(), (previous, current) => [some$2(current), match$8(previous, {
 				onNone: () => [{
@@ -119615,7 +119785,6 @@ var Chapters = class Chapters extends Service$1()("@deslop/opm/services/chapters
 		});
 	}));
 };
-const layerChapters = unwrap$8(pipe(dataDirectory, failed("The chapters folder could not be read."), map$6(Chapters.layer)));
 // src/main.server.ts
 runApp({
 	icon: icon_default,
@@ -119629,6 +119798,6 @@ runApp({
 				"library.watch": () => chapters.changes
 			});
 		}))
-	}), provide$2(layerJson$1), provide$2(layerChapters))
+	}), provide$2(layerJson$1), provide$2(Chapters.layer), provide$2(layerDataStore))
 });
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@deslop/opm",
-	"version": "0.1.1247",
+	"version": "0.1.1249",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/MP281X/deslop.git",
@@ -31,5 +31,5 @@
 	"engines": {
 		"node": ">=26"
 	},
-	"fingerprint": "6aa51ed4032a5ac9cf23305b328ea59541f438b63683aee8303fde077a034822"
+	"fingerprint": "3fecf483e0cf4058cec00c7e864e987b7a6e1c9054a79bf987b32e736a5df54a"
 }