@deslop/trips 0.1.1249 → 0.1.1256

package/README.md

@@ -4,9 +4,9 @@ Your flights, trains and stays, with live gates, delays and platforms, for the T
 
 ```bash
 npm install --global @deslop/trips
-trips service install --url https://trips.mp281x.xyz --auth https://auth.mp281x.xyz --apns-key-id <id> --apns-team-id <team>
+trips service install --url https://trips.mp281x.xyz --auth https://auth.mp281x.xyz --gateway https://gateway.mp281x.xyz --apns-key-id <id> --apns-team-id <team>
 ```
 
-- **Secrets** in `~/.deslop/trips.env`: `AEROAPI_KEY`, `ANTHROPIC_API_KEY`, `APNS_KEY`.
+- **Secrets** in `~/.deslop/trips.env`: `AEROAPI_KEY`, `APNS_KEY`; AI keys live in Gateway.
 
 Common flags and service commands: [Deslop app runtime](https://github.com/MP281X/deslop/blob/main/packages/runtime/README.md).

package/dist/server.js

@@ -5957,6 +5957,36 @@ const has$4 = /*#__PURE__*/ dual(2, (self, key) => Object.hasOwn(self, key));
 */
 const get$11 = /*#__PURE__*/ dual(2, (self, key) => Object.hasOwn(self, key) ? some$1(self[key]) : none());
 /**
+* Removes a key from a record.
+*
+* **When to use**
+*
+* Use to create a shallow copy of a record without one property.
+*
+* **Details**
+*
+* If the key is not present, the result is still a shallow copy of the original
+* record.
+*
+* **Example** (Removing a key)
+*
+* ```ts import.meta.vitest
+* import { Record } from "effect"
+*
+* Record.remove({ a: 1, b: 2 }, "a") // => { b: 2 }
+* ```
+*
+* @stability stable
+* @category mutations
+* @since 2.0.0
+*/
+const remove$6 = /*#__PURE__*/ dual(2, (self, key) => {
+	if (!has$4(self, key)) return { ...self };
+	const out = { ...self };
+	delete out[key];
+	return out;
+});
+/**
 * Maps a record into another record by applying a transformation function to each of its values.
 *
 * **Example** (Mapping record values)
@@ -34849,6 +34879,8 @@ function decodeUnknownEffect$1(schema, options) {
 function decodeUnknownOption$1(schema, options) {
 	return asOption(decodeUnknownEffect$1(schema, options));
 }
+/** @internal */
+const decodeOption$1 = decodeUnknownOption$1;
 /**
 * Creates an effectful encoder for `unknown` input.
 *
@@ -37366,6 +37398,33 @@ const decodeEffect = decodeUnknownEffect;
 */
 const decodeUnknownOption = decodeUnknownOption$1;
 /**
+* Decodes a typed input (the schema's `Encoded` type) against a schema,
+* returning an `Option` that is `Some` with the decoded value on success or
+* `None` for schema mismatches.
+*
+* **When to use**
+*
+* Use when you already have input typed as the schema's `Encoded` type and
+* only need to know whether decoding succeeded.
+*
+* **Details**
+*
+* For `unknown` input use {@link decodeUnknownOption}.
+* Options may be provided either when creating the decoder or when applying it;
+* application options override creation options.
+*
+* **Gotchas**
+*
+* Only causes made entirely of schema issues are converted to `None`. Causes
+* that contain defects, interruptions, or other non-schema reasons throw
+* instead.
+*
+* @stability stable
+* @category decoding
+* @since 3.10.0
+*/
+const decodeOption = decodeOption$1;
+/**
 * Decodes an `unknown` input against a schema synchronously, returning the
 * decoded value or throwing a {@link SchemaError} for schema mismatches.
 *
@@ -39697,6 +39756,25 @@ function Redacted$1(value$7, options) {
 	});
 	return make$56(schema.ast, { value: value$7 });
 }
+/**
+* Decodes a value and wraps it in `Redacted<A>`. Unlike {@link Redacted} which
+* expects the input to already be a `Redacted` instance, this schema decodes
+* the raw value and wraps it.
+*
+* @see {@link Redacted} for schemas whose input is already a `Redacted` value.
+* @stability stable
+* @category schemas
+* @since 4.0.0
+*/
+function RedactedFromValue(value$8, options) {
+	return decodeTo(Redacted$1(toType(value$8), {
+		label: options?.label,
+		disallowJsonEncode: options?.disallowEncode
+	}), {
+		decode: transform$4((t) => make$61(t, { label: options?.label })),
+		encode: options?.disallowEncode ? forbidden((oe) => "Cannot encode Redacted" + (isSome(oe) && typeof oe.value.label === "string" ? ` with label: "${oe.value.label}"` : "")) : transform$4(value)
+	})(value$8);
+}
 const immerable = /*#__PURE__*/ globalThis.Symbol.for("immer-draftable");
 const payloadToken = {};
 function makeClass(Inherited, identifier, struct$1, annotations, proto) {
@@ -51476,6 +51554,14 @@ const endSpanWithStatusError = (fiber, span, request, response) => {
 */
 const mapRequest = /*#__PURE__*/ dual(2, (self, f) => makeWith(self.postprocess, (request) => map$5(self.preprocess(request), f)));
 /**
+* Appends an effectful transformation of the request object before sending it.
+*
+* @stability unstable
+* @category mapping
+* @since 4.0.0
+*/
+const mapRequestEffect = /*#__PURE__*/ dual(2, (self, f) => makeWith(self.postprocess, (request) => flatMap$3(self.preprocess(request), f)));
+/**
 * Retries common transient errors, such as rate limiting, timeouts or network issues.
 *
 * **When to use**
@@ -78537,6 +78623,29 @@ var AiError = class extends (/*#__PURE__*/ Error$1("effect/ai/AiError/AiError")(
 	}
 };
 /**
+* Type guard to check if a value is an `AiError`.
+*
+* **Example** (Checking for an AI error)
+*
+* ```ts import.meta.vitest
+* import { AiError } from "effect/ai"
+*
+* const someError = new Error("generic error")
+* const aiError = AiError.make({
+*   module: "Test",
+*   method: "example",
+*   reason: new AiError.RateLimitError({})
+* })
+*
+* const result = [AiError.isAiError(someError), AiError.isAiError(aiError)] // => [false, true]
+* ```
+*
+* @stability unstable
+* @category guards
+* @since 4.0.0
+*/
+const isAiError = (u) => hasProperty(u, TypeId$4);
+/**
 * Type guard to check if a value is an `AiErrorReason`.
 *
 * **Example** (Checking for an AI error reason)
@@ -83106,6 +83215,78 @@ function failureOptions(error, status) {
 }
 var CurrentUser = class extends Service$1()("@deslop/runtime/auth/lib/utils/CurrentUser") {};
 var RpcAuth = class extends Service()("@deslop/runtime/auth/lib/utils/RpcAuth", { error: AuthError }) {};
+Literals([
+	"anthropic",
+	"openrouter",
+	"opencode-zen",
+	"opencode-go"
+]);
+// ../../packages/runtime/src/ai/service.ts
+var AiUnavailable = class extends TaggedError()("AiUnavailable", { message: String$6 }) {};
+const Refusal = fromJsonString(Struct({ error: Struct({ message: String$6 }) }));
+function aiFailure(cause) {
+	if (is(AiUnavailable)(cause)) return some$1(cause.message);
+	if (!isAiError(cause)) return none();
+	if (cause.reason._tag === "NetworkError") return some$1(cause.reason.description ?? cause.reason.message);
+	if (cause.reason._tag === "UnknownError" && cause.reason.http?.body !== void 0) return map$11(decodeOption(Refusal)(cause.reason.http.body), (body) => body.error.message);
+	return some$1(cause.reason.message);
+}
+var AiGateway = class AiGateway extends Service$1()("@deslop/runtime/ai/service/AiGateway") {
+	static layer = effect(this, gen(function* () {
+		const gateway = yield* option(String$5("GATEWAY_URL"));
+		const local = yield* localAuth;
+		const app = yield* String$5("APP_URL");
+		const client = yield* HttpClient;
+		const store = toSchemaStore(yield* KeyValueStore, Record$1(String$6, RedactedFromValue(String$6)));
+		const grants = yield* make$42(getOrElse(yield* store.get("ai-gateway-grants"), () => ({})));
+		const lock = yield* make$66(1);
+		return AiGateway.of({
+			apiUrl: (provider) => match$9(gateway, {
+				onNone: () => fail$6(AiUnavailable.make({ message: "Start the app with --gateway" })),
+				onSome: (url) => succeed$5(`${url}/ai/${provider}${match$1(provider === "openrouter", {
+					onFalse: () => "",
+					onTrue: () => "/v1"
+				})}`)
+			}),
+			authorize: (userId) => (http) => pipe(mapRequestEffect(http, (request) => gen(function* () {
+				if (local) return request;
+				const token = (yield* get$2(grants))[userId];
+				if (token === void 0) return yield* new HttpClientError({ reason: new TransportError({
+					description: "AI access is unavailable; sign in again to enroll with Gateway",
+					request
+				}) });
+				return setHeader$1(request, "authorization", `Bearer ${value(token)}`);
+			})), tap((response) => pipe(gen(function* () {
+				if (local || response.headers["x-gateway-grant-refused"] === void 0 || !exists(gateway, (url) => startsWith(`${url}/ai/`)(response.request.url))) return;
+				const current = yield* get$2(grants);
+				const token = current[userId];
+				if (token === void 0 || response.request.headers["authorization"] !== `Bearer ${value(token)}`) return;
+				const next = remove$6(current, userId);
+				yield* pipe(store.set("ai-gateway-grants", next), ignore$1({
+					log: "Warn",
+					message: "The rejected AI grant could not be removed from storage"
+				}));
+				yield* set(grants, next);
+			}), withPermit(lock)))),
+			enroll: fnUntraced(function* (userId, headers) {
+				return yield* pipe(gen(function* () {
+					if (local || isNone(gateway) || (yield* get$2(grants))[userId] !== void 0) return;
+					const response = yield* client.execute(yield* bodyJson(post(`${getOrElse(gateway, () => "")}/ai/grants`, { headers: match$1(headers["authorization"] !== void 0, {
+						onFalse: () => ({ cookie: headers["cookie"] ?? "" }),
+						onTrue: () => ({ authorization: headers["authorization"] })
+					}) }), { app }));
+					const result = yield* schemaBodyJson(Struct({ token: String$6 }))(response);
+					const next = {
+						...yield* get$2(grants),
+						[userId]: make$61(result.token)
+					};
+					yield* store.set("ai-gateway-grants", next);
+					yield* set(grants, next);
+				}), withPermit(lock), timeout$1("10 seconds"), catch_$2(() => logWarning("AI Gateway enrollment failed")));
+			})
+		});
+	}));
+};
 // ../../packages/runtime/src/auth/service.ts
 function rejected(message) {
 	return mapError$2((cause) => {
@@ -83124,12 +83305,18 @@ function rejected(message) {
 function developer() {
 	return succeed$5(DEVELOPER);
 }
+function enrolled(user, headers) {
+	return gen(function* () {
+		const gateway = getOrUndefined(yield* context(), AiGateway);
+		if (gateway !== void 0) yield* gateway.enroll(user.id, headers);
+	});
+}
 const unavailable = text$1("The authorization service is temporarily unavailable; retry later", {
 	headers: { "retry-after": "5" },
 	status: 503
 });
 var Auth = class Auth extends Service$1()("@deslop/runtime/auth/service/Auth") {
-	static makeContext = (auth) => pipe(make$76(Auth, auth), add$1(RpcAuth, RpcAuth.of((effect, request) => pipe(auth.user(request.headers), tap$2(() => {
+	static makeContext = (auth) => pipe(make$76(Auth, auth), add$1(RpcAuth, RpcAuth.of((effect, request) => pipe(auth.user(request.headers), tap$2((user) => enrolled(user, request.headers)), tap$2(() => {
 		if (isStreamSchema(request.rpc.successSchema)) return annotateCurrentSpan("rpc.stream", true);
 		return void_$1;
 	}), flatMap$3((user) => raceFirst(provideService$2(effect, CurrentUser, user), pipe(delay(auth.user(request.headers), "5 minutes"), retry({ while: (error) => error.error === "temporarily_unavailable" }), forever)))))));
@@ -83164,6 +83351,7 @@ middleware()(gen(function* () {
 			if (user.failure.error === "temporarily_unavailable") return unavailable;
 			return text$1("Sign in first", { status: 401 });
 		}
+		yield* enrolled(user.success, (yield* HttpServerRequest).headers);
 		return yield* provideService$2(app, CurrentUser, user.success);
 	});
 }));
@@ -83546,6 +83734,11 @@ const SETTINGS = {
 		flag: "auth",
 		schema: SecureOrigin
 	},
+	GATEWAY_URL: {
+		description: "Deslop Gateway origin for AI calls",
+		flag: "gateway",
+		schema: Origin
+	},
 	HOST: {
 		description: `Listen address; defaults to ${DEFAULT_HOST}`,
 		flag: "host",
@@ -83577,7 +83770,7 @@ function server(app) {
 	return pipe(serve(pipe(mergeAll$2(app.routes, layerRoutes, layerIcon(app.icon), layerWeb, layerAnnounce), provide$2(match$9(fromUndefinedOr(app.middleware), {
 		onNone: () => empty$13,
 		onSome: (middleware$1) => middleware()(middleware$1).layer
-	})), provide$2(Auth.layer)), {
+	})), provide$2(Auth.layer), provideMerge(pipe(AiGateway.layer, provide$2(layerDataStore)))), {
 		disableLogger: true,
 		middleware: guard
 	}), provide$2(mergeAll$2(layerProtocol, match$1(app.telemetry === false, {
@@ -93071,15 +93264,22 @@ function bounded(text) {
 }
 var Extractor = class Extractor extends Service$1()("@deslop/trips/services/bookings/lib/extraction/Extractor") {
 	static layer = effect(this, gen(function* () {
-		const key = yield* option(Redacted("ANTHROPIC_API_KEY"));
-		const model = yield* pipe(make({
-			config: {
-				max_tokens: 16e3,
-				output_config: { effort: "high" }
-			},
-			model: "claude-haiku-5-5"
-		}), provideServiceEffect(AnthropicClient, make$1({ apiKey: getOrUndefined$1(key) })));
-		const generate = fn("Extractor.generate")(function* (source) {
+		const gateway = yield* AiGateway;
+		const http = yield* HttpClient;
+		const model = fnUntraced(function* (userId) {
+			return yield* pipe(make({
+				config: {
+					max_tokens: 16e3,
+					output_config: { effort: "high" }
+				},
+				model: "claude-haiku-5-5"
+			}), provideServiceEffect(AnthropicClient, pipe(make$1({
+				apiUrl: yield* gateway.apiUrl("anthropic"),
+				transformClient: gateway.authorize(userId)
+			}), provideService$2(HttpClient, http))));
+		});
+		return Extractor.of({ read: fn("Extractor.read")(function* (userId, source) {
+			const anthropic = yield* model(userId);
 			const today = `Today: ${formatIsoDateUtc(makeUnsafe$3(yield* currentTimeMillis))}`;
 			function content() {
 				if (hasProperty(source, "image")) return [{
@@ -93092,7 +93292,7 @@ var Extractor = class Extractor extends Service$1()("@deslop/trips/services/book
 				}];
 				return `${today}\n\n${bounded(source.text)}`;
 			}
-			return (yield* model.generateObject({
+			return (yield* anthropic.generateObject({
 				prompt: [{
 					content: INSTRUCTIONS,
 					role: "system"
@@ -93102,16 +93302,13 @@ var Extractor = class Extractor extends Service$1()("@deslop/trips/services/book
 				}],
 				schema: Extraction
 			})).value.items;
-		}, timeout$1("3 minutes"), retry({ times: 1 }), mapError$2((cause) => BookingsError.make({
+		}, timeout$1("3 minutes"), retry({
+			times: 1,
+			while: (cause) => !is(AiUnavailable)(cause)
+		}), mapError$2((cause) => BookingsError.make({
 			cause: make$61(cause),
-			message: "The AI could not read the booking."
-		})));
-		return Extractor.of({ read: fn("Extractor.read")(function* (source) {
-			return yield* match$9(key, {
-				onNone: () => fail$6(BookingsError.make({ message: "The server has no AI key to read bookings." })),
-				onSome: () => generate(source)
-			});
-		}) });
+			message: getOrElse(aiFailure(cause), () => "The AI could not read the booking.")
+		}))) });
 	}));
 };
 // src/services/bookings/lib/utils.ts
@@ -93819,8 +94016,8 @@ var Bookings = class Bookings extends Service$1()("@deslop/trips/services/bookin
 					return make$75(void 0, [...current, booking]);
 				});
 			}),
-			save: fn("Bookings.save")(function* (source) {
-				const items = yield* extractor.read(source);
+			save: fn("Bookings.save")(function* (userId, source) {
+				const items = yield* extractor.read(userId, source);
 				if (isReadonlyArrayEmpty(items)) return yield* BookingsError.make({ message: "No booking found. Copy a confirmation or boarding pass and try again." });
 				const resolved = yield* forEach$1(items, (item) => result(resolve(item)), { concurrency: 1 });
 				const issues = getFailures(resolved);
@@ -121874,7 +122071,7 @@ runApp({
 				"bookings.refresh": (input) => tracker.refresh(input.id),
 				"bookings.remove": (input) => bookings.remove(input.id),
 				"bookings.restore": (input) => bookings.restore(input),
-				"bookings.save": (input) => bookings.save(input),
+				"bookings.save": (input) => flatMap$3(CurrentUser, (user) => bookings.save(user.id, input)),
 				"bookings.watch": () => bookings.events,
 				"devices.register": (input) => push.register(input)
 			});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@deslop/trips",
-	"version": "0.1.1249",
+	"version": "0.1.1256",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/MP281X/deslop.git",
@@ -30,5 +30,5 @@
 	"engines": {
 		"node": ">=26"
 	},
-	"fingerprint": "65423ef948406ff5bee8b891f295a67c3799d24c02475a58ea64ae7b131685b8"
+	"fingerprint": "72cb3e330ae400d6eed04c6308b0f230fd667441197fd59f248740abe95c20a1"
 }