@deslop/gateway 0.1.1260 → 0.1.1261

package/dist/client/index.html

@@ -15,9 +15,9 @@
 		<link rel="manifest" href="/manifest.webmanifest" />
 
 		<title>Gateway</title>
-		<script type="module" crossorigin src="/assets/index-DXPokkvI.js"></script>
+		<script type="module" crossorigin src="/assets/index-DWNgL0cx.js"></script>
 		<link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-XKyaHtl9.js">
-		<link rel="modulepreload" crossorigin href="/assets/effect-CmAQ3NBe.js">
+		<link rel="modulepreload" crossorigin href="/assets/effect-DmsZG62Z.js">
 		<link rel="modulepreload" crossorigin href="/assets/react-BPjvcVqE.js">
 		<link rel="stylesheet" crossorigin href="/assets/index-CD0fisUK.css">
 	</head>

package/dist/server.js

@@ -38285,6 +38285,36 @@ function decodeUnknownResult(schema, options) {
 	};
 }
 /**
+* Decodes a typed input (the schema's `Encoded` type) against a schema,
+* returning a `Result` that succeeds with the decoded value or fails with a
+* {@link SchemaError} for schema mismatches.
+*
+* **When to use**
+*
+* Use when you already have input typed as the schema's `Encoded` type and want
+* schema mismatches returned as `Result.fail` with `SchemaError`.
+*
+* **Details**
+*
+* For `unknown` input use {@link decodeUnknownResult}.
+* Options may be provided either when creating the decoder or when applying it;
+* application options override creation options.
+* Schema mismatches are returned as `Result.fail` with `SchemaError`.
+*
+* **Gotchas**
+*
+* Only causes made entirely of schema issues are returned as `Result.fail`.
+* Causes that contain defects, interruptions, or other non-schema reasons throw
+* instead.
+*
+* @see {@link SchemaParser.decodeResult} for the adapter that fails with `SchemaIssue.Issue` directly
+*
+* @stability stable
+* @category decoding
+* @since 4.0.0
+*/
+const decodeResult = decodeUnknownResult;
+/**
 * Decodes an `unknown` input against a schema synchronously, returning the
 * decoded value or throwing a {@link SchemaError} for schema mismatches.
 *
@@ -89976,6 +90006,9 @@ function layerOtlp(serviceName, url, runtime, version) {
 const ISSUER_PATH = "/api/auth";
 const APPS_PATH = "/api/apps";
 const SESSION_COOKIE = "__Host-session";
+function matchingSessions(saved, userId) {
+	return sort(filter$5(getSomes(saved), (session) => session.value.user.id === userId), mapInput(flip$1(Number$6), (session) => session.value.expiresAt));
+}
 function bearerOf(headers) {
 	return flatMapNullishOr(match$3(/^bearer +(?<token>\S+) *$/iu)(headers["authorization"] ?? ""), (found) => found.groups?.["token"]);
 }
@@ -91035,8 +91068,7 @@ var Sessions = class Sessions extends Service$1()("@deslop/runtime/auth/sessions
 				key,
 				value
 			}))), { concurrency: "unbounded" });
-			const candidates = sort(filter$5(getSomes(saved), (session) => session.value.user.id === userId), mapInput(flip$1(Number$6), (session) => session.value.expiresAt));
-			for (const session of candidates) {
+			for (const session of matchingSessions(saved, userId)) {
 				if (yield* fresh(session.value)) return session.value.access;
 				const renewed = yield* result$1(pipe$1(refreshed(session.key), rejected$1("AI access is temporarily unavailable")));
 				if (renewed._tag === "Success") return renewed.success.access;
@@ -91899,7 +91931,7 @@ const Usage = Struct({
 		}))
 	})),
 	model: optionalKey(String$6),
-	usage: optionalKey(Struct({
+	usage: optionalKey(NullOr(Struct({
 		cache_creation_input_tokens: optionalKey(Finite),
 		cache_read_input_tokens: optionalKey(Finite),
 		completion_tokens: optionalKey(Finite),
@@ -91911,36 +91943,37 @@ const Usage = Struct({
 			cache_write_tokens: optionalKey(Finite),
 			cached_tokens: optionalKey(Finite)
 		}))
-	}))
+	})))
 });
 // src/services/ai/usage.ts
 function readUsage(text, entry) {
-	const decoded = decodeOption(fromJsonString(Usage))(text);
-	if (decoded._tag === "None") return entry;
-	const usage = {
-		...decoded.value.message?.usage,
-		...decoded.value.usage
-	};
-	const cacheReadTokens = usage.cache_read_input_tokens ?? decoded.value.usage?.prompt_tokens_details?.cached_tokens ?? entry.cacheReadTokens;
-	const cacheWriteTokens = usage.cache_creation_input_tokens ?? decoded.value.usage?.prompt_tokens_details?.cache_write_tokens ?? entry.cacheWriteTokens;
-	return {
-		...entry,
-		cacheReadTokens,
-		cacheWriteTokens,
-		inputTokens: usage.input_tokens ?? match$8(fromUndefinedOr(usage.prompt_tokens), {
-			onNone: () => entry.inputTokens,
-			onSome: (prompt) => max(0, prompt - cacheReadTokens - cacheWriteTokens)
-		}),
-		model: decoded.value.model ?? decoded.value.message?.model ?? entry.model,
-		outputTokens: usage.output_tokens ?? usage.completion_tokens ?? entry.outputTokens,
-		...match$1(decoded.value.usage?.cost !== void 0 || decoded.value.cost !== void 0, {
-			onFalse: () => ({}),
-			onTrue: () => ({
-				costSource: "provider",
-				costUsd: decoded.value.usage?.cost ?? decoded.value.cost
+	if (isEmpty$1(trim(text)) || text === "[DONE]") return succeed$10(entry);
+	return map$10(decodeResult(fromJsonString(Usage))(text), (decoded) => {
+		const usage = {
+			...decoded.message?.usage,
+			...decoded.usage
+		};
+		const cacheReadTokens = usage.cache_read_input_tokens ?? decoded.usage?.prompt_tokens_details?.cached_tokens ?? entry.cacheReadTokens;
+		const cacheWriteTokens = usage.cache_creation_input_tokens ?? decoded.usage?.prompt_tokens_details?.cache_write_tokens ?? entry.cacheWriteTokens;
+		return {
+			...entry,
+			cacheReadTokens,
+			cacheWriteTokens,
+			inputTokens: usage.input_tokens ?? match$8(fromUndefinedOr(usage.prompt_tokens), {
+				onNone: () => entry.inputTokens,
+				onSome: (prompt) => max(0, prompt - cacheReadTokens - cacheWriteTokens)
+			}),
+			model: decoded.model ?? decoded.message?.model ?? entry.model,
+			outputTokens: usage.output_tokens ?? usage.completion_tokens ?? entry.outputTokens,
+			...match$1(decoded.usage?.cost !== void 0 || decoded.cost !== void 0, {
+				onFalse: () => ({}),
+				onTrue: () => ({
+					costSource: "provider",
+					costUsd: decoded.usage?.cost ?? decoded.cost
+				})
 			})
-		})
-	};
+		};
+	});
 }
 function totals(rows) {
 	return reduce(rows, {
@@ -91991,10 +92024,10 @@ function report(entries, query) {
 			model: group[0].model ?? "unknown",
 			...totals(group)
 		})),
-		series: sort(map$8(toEntries(groupBy(selected, (entry) => `${bucket(entry)}`)), (group) => ({
-			at: getOrElse(parse$4(group[0]), () => 0),
-			byApp: grouped(group[1], (entry) => entry.app),
-			byModel: grouped(group[1], (entry) => entry.model ?? "unknown")
+		series: sort(map$8(values(groupBy(selected, (entry) => `${bucket(entry)}`)), (group) => ({
+			at: bucket(group[0]),
+			byApp: grouped(group, (entry) => entry.app),
+			byModel: grouped(group, (entry) => entry.model ?? "unknown")
 		})), mapInput(Order$3, (entry) => entry.at)),
 		totals: totals(selected)
 	};
@@ -92057,7 +92090,7 @@ const make = gen(function* () {
 				const now = yield* currentTimeMillis;
 				if (now - pricing.refreshed < 864e5) return;
 				pricing.refreshed = now;
-				pricing.catalog = yield* pipe$1(client.get("https://models.dev/api.json"), flatMap$2(schemaBodyJson$1(ModelsCatalog)), timeout$1("10 seconds"), orElseSucceed(() => pricing.catalog));
+				pricing.catalog = yield* pipe$1(client.get("https://models.dev/api.json"), flatMap$2(schemaBodyJson$1(ModelsCatalog)), timeout$1("10 seconds"), tapError$3((error) => logWarning("The pricing catalog could not be refreshed; keeping cached pricing", error)), orElseSucceed(() => pricing.catalog));
 			}), withPermit(pricingLock));
 			const catalogProvider = match$1(entry.provider === "opencode-zen", {
 				onFalse: () => entry.provider,
@@ -92145,6 +92178,9 @@ const make = gen(function* () {
 					current: entry,
 					pending: ""
 				};
+				const updateUsage = fnUntraced(function* (text) {
+					state.current = yield* pipe$1(fromResult(readUsage(text, state.current)), catch_$2((error) => as(logWarning("AI usage was malformed; keeping previously read usage", error), state.current)));
+				});
 				const sse = includes("text/event-stream")(response.headers["content-type"] ?? "");
 				const decoder = new TextDecoder();
 				yield* pipe$1(fromReadableStream({
@@ -92153,20 +92189,20 @@ const make = gen(function* () {
 						cause,
 						message: "AI usage could not be read"
 					})
-				}), takeWhile(() => state.pending.length <= 10485760), runForEach((chunk) => sync(() => {
+				}), takeWhile(() => state.pending.length <= 10485760), runForEach((chunk) => gen(function* () {
 					state.pending += decoder.decode(chunk, { stream: true });
 					if (!sse) return;
 					const lines = split$2(/\r?\n/u)(state.pending);
 					state.pending = getOrElse(last(lines), () => "");
-					for (const line of dropRight(lines, 1)) if (startsWith("data:")(line)) state.current = readUsage(trim(slice$1(5)(line)), state.current);
+					for (const line of dropRight(lines, 1)) if (startsWith("data:")(line)) yield* updateUsage(trim(slice$1(5)(line)));
 				})), ignore$1({
 					log: "Warn",
 					message: "AI usage response could not be read"
 				}));
-				state.current = readUsage(match$1(sse, {
+				yield* updateUsage(match$1(sse, {
 					onFalse: () => state.pending,
 					onTrue: () => replace(/^data:\s*/u, "")(state.pending)
-				}), state.current);
+				}));
 				yield* saveUsage(id, state.current);
 			}), catch_$2((error) => logWarning("AI usage could not be saved", error)), forkIn(scope));
 			const responseBlocked = [
@@ -119397,6 +119433,10 @@ var Connections = class Connections extends Service$1()("@deslop/gateway/service
 	static layer = effect(Connections)(Connections.make);
 };
 // src/services/gateway/lib/utils.ts
+function prunedTools(definitions, installed) {
+	const connected = fromIterable$2(map$8(filter$5(definitions, (server) => server.link._tag !== "Disconnected"), (server) => make$83(server.id, server.generation)));
+	return map$8(filter$5(toEntries(installed), (entry) => !has(connected, make$83(entry[1].id, entry[1].generation))), (entry) => entry[0]);
+}
 function quiet(property) {
 	if (isBoolean$1(property)) return property;
 	return filter$6(property, (value, key) => !((key === "maximum" || key === "minimum") && isNumber(value) && Math.abs(value) >= 9007199254740991));
@@ -119454,8 +119494,10 @@ var Gateway = class Gateway extends Service$1()("@deslop/gateway/services/gatewa
 			yield* registry.notifications["notifications/tools/list_changed"]({});
 		});
 		const prune = gen(function* () {
-			const connected = fromIterable$2(map$8(filter$5(yield* connections.definitions, (server) => server.link._tag !== "Disconnected"), (server) => make$83(server.id, server.generation)));
-			for (const entry of toEntries(yield* get$1(installed))) if (!has(connected, make$83(entry[1].id, entry[1].generation))) yield* remove(entry[0]);
+			yield* forEach$1(prunedTools(yield* connections.definitions, yield* get$1(installed)), remove, {
+				concurrency: 1,
+				discard: true
+			});
 		});
 		const updateVisible = fnUntraced(function* (server, names) {
 			if (yield* modify$1(visible, (current) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@deslop/gateway",
-	"version": "0.1.1260",
+	"version": "0.1.1261",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/MP281X/deslop.git",
@@ -33,5 +33,5 @@
 	"engines": {
 		"node": ">=26"
 	},
-	"fingerprint": "c24d4a97778975903d7919c24db6d9b7a3c8c821e90dfe152782f4652da7efdc"
+	"fingerprint": "0c513e501147583b164de1e24922f61c17a06b686fb4ee51b82860feaaef3244"
 }