@teamscala/service-boot 0.23.362 → 0.23.364

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "@teamscala/service-boot",
   "type": "module",
-  "version": "0.23.362",
+  "version": "0.23.364",
   "sideEffects": false,
   "imports": {
     "#service-boot/*": "./src/*",

package/src/attach-transfers-upload.ts

@@ -6,11 +6,11 @@
  * Authenticated asset upload — POST /api/transfers/upload. Restores the
  * handler deleted with @teamscala/server-files (commit ca5643ef); avatar/logo
  * upload had 404'd on every service since. Writes to S3 via
- * @teamscala/object-storage/create/write-ops and returns the STORED-form URL
- * (`/api/files/<key>`) the client persists into avatar_url/logo_url — the
- * display path rewrites it to the public `/api/assets/<encoded-key>` proxy
- * via `toAssetPath` (@teamscala/formatters/asset-url). Self-authenticates
- * (getSession) so it mounts BEFORE the auth gate.
+ * @teamscala/object-storage/create/write-ops and returns the SERVABLE URL
+ * (`/api/assets/<key>`) the client persists into avatar_url/logo_url — the
+ * stored value is the servable value (single-logo-pathway), so display code
+ * reads the column with no rewriting. Self-authenticates (getSession) so it
+ * mounts BEFORE the auth gate.
  *
  * Key scheme is USER-scoped (`users/<userId>/<type>/<file>-<ts>.<ext>`) per
  * the operator ruling: a profile picture belongs to the individual, not any
@@ -104,7 +104,7 @@ export async function attachTransfersUpload(app: Hono): Promise<void> {
 			});
 		}
 
-		const storedUrl = `/api/files/${key}`;
+		const storedUrl = `/api/assets/${key}`;
 		return c.json({ url: storedUrl, thumbUrl: storedUrl });
 	});
 }

package/src/handlers/platform-fault-escalation.ts

@@ -51,6 +51,7 @@ import { loadRegistryConfig } from "@teamscala/db/registry/load-config";
 import { recordEvent } from "@teamscala/event-log/record-event";
 import { getAppLogger } from "@teamscala/logger/app-loggers";
 import { pgBossHandlerRegistry } from "../pg-boss-handler-registry.ts";
+import { getServerClient } from "../page-server-orpc/server-client.ts";
 import {
 	composeEscalationDescription,
 	composeEscalationMessage,
@@ -116,6 +117,42 @@ async function getSystemIdentity(): Promise<{ userId: string | undefined; organi
 	return cachedSystemIdentity;
 }
 
+/**
+ * The system-authed in-process ORPC client (set at boot after the router is
+ * built — no-arg form carries the system super-admin context, correct for a
+ * platform system action). Per `no-direct-prisma-outside-orpc`, every WRITE in
+ * this handler routes through it; the single raw read (the event_log
+ * recurrence aggregate, a GROUP BY no generated CRUD expresses) uses the
+ * assigned-client form with $queryRawUnsafe — the lane-attention-sweep
+ * precedent in this same directory. Timestamps are ISO strings, never Date
+ * instances (the generated valibot schemas require it).
+ */
+function orpc(): OrpcSurface {
+	return getServerClient() as unknown as OrpcSurface;
+}
+
+/** The router subset this handler uses — mirrors the generated procedure args. */
+interface OrpcSurface {
+	platform_fault_escalations: {
+		upsert(args: {
+			where: { kind: string };
+			create: Record<string, unknown>;
+			update: Record<string, unknown>;
+		}): Promise<unknown>;
+		update(args: { where: { kind: string }; data: Record<string, unknown> }): Promise<unknown>;
+		findMany(args?: { where?: Record<string, unknown> }): Promise<Array<Record<string, unknown>>>;
+	};
+	messaging_bots: {
+		findFirst(args: Record<string, unknown>): Promise<Record<string, unknown> | null>;
+	};
+	work_items: {
+		create(args: { data: Record<string, unknown>; select?: Record<string, unknown> }): Promise<{ id: string }>;
+	};
+	comments: {
+		create(args: { data: Record<string, unknown> }): Promise<{ id: string }>;
+	};
+}
+
 async function loadConfig(): Promise<FaultEscalationConfig> {
 	return loadRegistryConfig("config", CONFIG_SLUG, FaultEscalationConfigSchema);
 }
@@ -150,15 +187,14 @@ async function fetchAggregates(patterns: string[], windowMinutes: number): Promi
 }
 
 async function resolveOperatorRelay(): Promise<OperatorRelayBot> {
-	const prisma = getPrisma();
-	const bot = await prisma.messaging_bots.findFirst({
+	const bot = (await orpc().messaging_bots.findFirst({
 		where: {
 			is_active: true,
 			platform: "whatsapp",
 			flow_config: { path: ["mode"], equals: "operator-relay" },
 		},
 		select: { id: true, organisation_id: true, external_id: true, flow_config: true },
-	});
+	})) as unknown as OperatorRelayBot | null;
 	if (!bot) throw new Error("platform-fault-escalation: no active operator-relay WhatsApp bot row");
 	const phone = (bot.flow_config as { operator_phone?: string } | null)?.operator_phone;
 	if (!phone) throw new Error("platform-fault-escalation: operator-relay bot has no operator_phone");
@@ -185,22 +221,21 @@ async function deliverEscalation(
 	config: FaultEscalationConfig,
 ): Promise<{ messageId: string; workItemId: string }> {
 	const log = getAppLogger();
-	const prisma = getPrisma();
 	const now = new Date();
 
 	// 1. Claim the episode BEFORE sending, so a send failure leaves a durable
 	// claim the next sweep retries instead of a lost escalation.
-	await prisma.platform_fault_escalations.upsert({
+	await orpc().platform_fault_escalations.upsert({
 		where: { kind },
 		create: {
 			kind,
-			first_seen_at: aggregate.firstSeen,
-			last_seen_at: aggregate.lastSeen,
+			first_seen_at: aggregate.firstSeen.toISOString(),
+			last_seen_at: aggregate.lastSeen.toISOString(),
 			event_count: aggregate.count,
 		},
 		update: {
-			first_seen_at: aggregate.firstSeen,
-			last_seen_at: aggregate.lastSeen,
+			first_seen_at: aggregate.firstSeen.toISOString(),
+			last_seen_at: aggregate.lastSeen.toISOString(),
 			event_count: aggregate.count,
 			resolved_at: null,
 		},
@@ -244,7 +279,7 @@ async function deliverEscalation(
 	}
 
 	// 4. Durable record: the work_items task the PA reads back / the operator answers on.
-	const workItem = await prisma.work_items.create({
+	const workItem = await orpc().work_items.create({
 		data: {
 			kind: "task",
 			parent_id: config.parent_project_id,
@@ -266,14 +301,14 @@ async function deliverEscalation(
 	});
 
 	// 5. Readback-correct the episode: delivered + linked in one update.
-	await prisma.platform_fault_escalations.update({
+	await orpc().platform_fault_escalations.update({
 		where: { kind },
 		data: {
-			escalated_at: now,
+			escalated_at: now.toISOString(),
 			work_item_id: workItem.id,
 			delivered_message_id: messageId,
-			last_updated_at: now,
-			updated_at: now,
+			last_updated_at: now.toISOString(),
+			updated_at: now.toISOString(),
 		},
 	});
 
@@ -290,19 +325,18 @@ async function deliverEscalation(
 }
 
 async function updateEpisode(aggregate: FaultAggregate, episode: EscalationEpisode): Promise<void> {
-	const prisma = getPrisma();
 	const now = new Date();
-	await prisma.platform_fault_escalations.update({
+	await orpc().platform_fault_escalations.update({
 		where: { kind: episode.kind },
 		data: {
-			last_seen_at: aggregate.lastSeen,
+			last_seen_at: aggregate.lastSeen.toISOString(),
 			event_count: aggregate.count,
-			last_updated_at: now,
-			updated_at: now,
+			last_updated_at: now.toISOString(),
+			updated_at: now.toISOString(),
 		},
 	});
 	if (episode.workItemId) {
-		await prisma.comments.create({
+		await orpc().comments.create({
 			data: {
 				work_item_id: episode.workItemId,
 				content: `Still recurring: ${aggregate.count} events, last at ${aggregate.lastSeen.toISOString()}. No new escalation (already escalated and unresolved).`,
@@ -318,14 +352,13 @@ async function updateEpisode(aggregate: FaultAggregate, episode: EscalationEpiso
 }
 
 async function resolveEpisode(episode: EscalationEpisode, quietMinutes: number): Promise<void> {
-	const prisma = getPrisma();
 	const now = new Date();
-	await prisma.platform_fault_escalations.update({
+	await orpc().platform_fault_escalations.update({
 		where: { kind: episode.kind },
-		data: { resolved_at: now, updated_at: now },
+		data: { resolved_at: now.toISOString(), updated_at: now.toISOString() },
 	});
 	if (episode.workItemId) {
-		await prisma.comments.create({
+		await orpc().comments.create({
 			data: {
 				work_item_id: episode.workItemId,
 				content: `Fault stopped — no '${episode.kind}' events for ${Math.round(quietMinutes)} min. Episode closed; the fault will re-escalate if it recurs.`,
@@ -349,9 +382,18 @@ async function platformFaultEscalationSweep(ctx: { config: ScheduledJobConfig })
 	// Only OPEN episodes matter: a resolved episode and no episode at all have
 	// the same meaning to decideSweep (a recurring sustained fault opens a NEW
 	// episode and escalates again).
-	const openEpisodes = await getPrisma().platform_fault_escalations.findMany({
+	const openEpisodes = (await orpc().platform_fault_escalations.findMany({
 		where: { resolved_at: null },
-	});
+	})) as Array<{
+		kind: string;
+		first_seen_at: string | Date;
+		last_seen_at: string | Date;
+		event_count: number;
+		escalated_at: string | Date | null;
+		work_item_id: string | null;
+		resolved_at: string | Date | null;
+		last_updated_at: string | Date | null;
+	}>;
 	const episodes: EscalationEpisode[] = openEpisodes.map((row) => ({
 		kind: row.kind,
 		firstSeenAt: new Date(row.first_seen_at),

package/src/register-registry-page-route/proposal-brand-stamping.ts

@@ -5,7 +5,6 @@
  *
  * Stamp partner and client brand assets onto a proposal page's pageData, after
  * it is built.
- *
  * Split from proposal-post-processors.ts (single-purpose-file: two unrelated
  * export groups). Both helpers here are synchronous, take an already-resolved
  * loader-graph org, and only map a logo/colour onto pageData — no network, no
@@ -13,7 +12,6 @@
  * async ORPC lookup, which is the distinction that was invisible while they sat
  * together.
  */
-import { toAssetPath } from "@teamscala/formatters/asset-url";
 
 /**
  * Stash a proposal's connected partner logo/colour on `pageData` from the
@@ -37,7 +35,7 @@ export function applyPartnerBrand(
 		| null,
 ): void {
 	if (!partnerOrg) return;
-	if (partnerOrg.logo_url) pageData.partnerLogo = toAssetPath(partnerOrg.logo_url);
+	if (partnerOrg.logo_url) pageData.partnerLogo = partnerOrg.logo_url;
 	if (partnerOrg.brand_primary_color)
 		pageData.partnerBrandColor = partnerOrg.brand_primary_color;
 }
@@ -56,5 +54,5 @@ export function applyClientLogo(
 		| null,
 ): void {
 	if (!clientOrg?.logo_url) return;
-	pageData.clientLogo = toAssetPath(clientOrg.logo_url);
+	pageData.clientLogo = clientOrg.logo_url;
 }

package/src/resource-not-found.test.ts

@@ -38,7 +38,7 @@ describe("buildResourceNotFoundResponse", () => {
 		const bytes = new Uint8Array([137, 80, 78, 71]);
 		const requested: string[] = [];
 		const logo = await inlineLogoAsDataUri(
-			"/api/files/c503629a/logos/cropped.png",
+			"/api/assets/c503629a/logos/cropped.png",
 			async () => ({
 				file(key) {
 					requested.push(key);
@@ -55,7 +55,7 @@ describe("buildResourceNotFoundResponse", () => {
 
 	it("passes the resolved logo to the waking page instead of its placeholder", async () => {
 		const logo = await inlineLogoAsDataUri(
-			"/api/files/c503629a/logos/cropped.png",
+			"/api/assets/c503629a/logos/cropped.png",
 			async () => ({
 				file() {
 					return {

package/src/resource-not-found.ts

@@ -33,7 +33,6 @@ import { createCache } from "@teamscala/cache/create-cache";
 import { createNotifyListener, getDirectDatabaseUrl } from "@teamscala/db/notify-listener/index";
 import { getServerClient } from "@teamscala/orpc/server-client-registry";
 import { loadRegistryConfig } from "@teamscala/db/registry/load-config";
-import { toAssetPath } from "@teamscala/formatters/asset-url";
 import { getAppLogger } from "@teamscala/logger/app-loggers";
 import { brandLogoImgTag } from "@teamscala/os/brand/brand-logo-img-tag";
 import { ServiceInstallConfigSchema } from "./load-service-install-row.ts";
@@ -134,10 +133,10 @@ const ASSETS_PREFIX = "/api/assets/";
 
 /**
  * Inline a stored logo value as a `data:<mime>;base64,…` URI by fetching its
- * bytes from S3 (the same store `/api/assets/` proxies to). Mirrors the asset
- * proxy's key extraction: `toAssetPath` normalises every stored form (bare
- * key, `/api/files/`, tigris URL) to `/api/assets/<key>`, and the proxy
- * decodes that path segment to the S3 key. Skew-tolerant: any miss → null.
+ * bytes from S3 (the same store `/api/assets/` proxies to). The stored value
+ * IS the servable form — `/api/assets/<key>` — so the bucket key is the path
+ * segment after that prefix (single-logo-pathway). Skew-tolerant: any miss →
+ * null.
  */
 type LogoStorage = {
 	file(key: string): {
@@ -151,9 +150,8 @@ export async function inlineLogoAsDataUri(
 	getStorage: () => Promise<LogoStorage | null> = getClient as unknown as () => Promise<LogoStorage | null>,
 ): Promise<string | null> {
 	try {
-		const assetPath = toAssetPath(stored);
-		if (!assetPath.startsWith(ASSETS_PREFIX)) return null;
-		const key = decodeURIComponent(assetPath.slice(ASSETS_PREFIX.length));
+		if (!stored.startsWith(ASSETS_PREFIX)) return null;
+		const key = decodeURIComponent(stored.slice(ASSETS_PREFIX.length));
 		const s3 = await getStorage();
 		if (!s3) return null;
 		const file = s3.file(key);