From c3b04b573229e32cd00040a5c802d840db007038 Mon Sep 17 00:00:00 2001 From: InTheta <17220028+InTheta@users.noreply.github.com> Date: Tue, 17 Nov 2026 13:40:14 +0000 Subject: [PATCH 1/2] Serve read-only sidecar Delivery in packaged T3 --- apps/server/src/deliverySidecarHttp.test.ts | 68 +++++++++++++++++++ apps/server/src/deliverySidecarHttp.ts | 72 +++++++++++++++++++++ apps/server/src/server.ts | 2 + apps/web/src/routes/_chat.delivery.tsx | 15 ++++- 4 files changed, 156 insertions(+), 1 deletion(-) create mode 100644 apps/server/src/deliverySidecarHttp.test.ts create mode 100644 apps/server/src/deliverySidecarHttp.ts diff --git a/apps/server/src/deliverySidecarHttp.test.ts b/apps/server/src/deliverySidecarHttp.test.ts new file mode 100644 index 0000000000000..a9a5f1aa2f839 --- /dev/null +++ b/apps/server/src/deliverySidecarHttp.test.ts @@ -0,0 +1,68 @@ +import { AuthSessionId } from "@t3tools/contracts"; +import * as Effect from "effect/Effect"; +import * as Layer from "effect/Layer"; +import { FetchHttpClient, HttpRouter } from "effect/http"; +import { expect, it, vi } from "vite-plus/test"; + +import { EnvironmentAuth } from "./auth/EnvironmentAuth.ts"; +import { layer } from "./deliverySidecarHttp.ts"; + +it("reads approved Delivery resources without forwarding client credentials", async () => { + vi.stubEnv("T3CODE_DELIVERY_SIDECAR_PORT", "45678"); + const upstream = vi + .spyOn(globalThis, "fetch") + .mockImplementation(async () => Response.json({ version: 1 })); + const { handler, dispose } = HttpRouter.toWebHandler( + layer.pipe( + Layer.provideMerge(FetchHttpClient.layer), + Layer.provideMerge( + Layer.mock(EnvironmentAuth)({ + authenticateHttpRequest: (request) => + Effect.succeed({ + sessionId: AuthSessionId.make("fixture-session"), + subject: "fixture", + method: "bearer-access-token", + scopes: request.headers.authorization ? ["orchestration:read"] : [], + }), + }), + ), + ), + { disableLogger: true }, + ); + const prefix = "/delivery-sidecar/v1/"; + const resource = "pull-requests/InTheta/omni-symphony-canary/340"; + const send = (path: string, method = "GET", authenticated = true) => + handler( + new Request(`http://localhost${prefix}${path}`, { + method, + headers: authenticated + ? { authorization: "Bearer t3-session", cookie: "session=test" } + : {}, + }), + ); + try { + expect((await send(resource, "GET", false)).status).toBe(403); + expect((await send(resource, "POST")).status).toBe(404); + expect((await send("pull-requests/org/repo%2Fextra/340")).status).toBe(404); + expect(upstream).not.toHaveBeenCalled(); + + const response = await send(`${resource}?ignored=yes`); + expect(response.status).toBe(200); + expect(response.headers.get("cache-control")).toBe("no-store"); + expect(await response.json()).toEqual({ version: 1 }); + const [url, init] = upstream.mock.calls[0] ?? []; + expect(String(url)).toBe(`http://127.0.0.1:45678${prefix}${resource}`); + expect(init?.redirect).toBe("error"); + expect(new Headers(init?.headers).get("authorization")).toBeNull(); + expect(new Headers(init?.headers).get("cookie")).toBeNull(); + + expect((await send("managed-runs/85c0326b-52e0-46dc-899d-d451c5afb228")).status).toBe(200); + vi.stubEnv("T3CODE_DELIVERY_SIDECAR_PORT", ""); + expect((await send(resource)).status).toBe(404); + expect(upstream).toHaveBeenCalledTimes(2); + } finally { + await dispose(); + upstream.mockRestore(); + vi.unstubAllEnvs(); + } +}); diff --git a/apps/server/src/deliverySidecarHttp.ts b/apps/server/src/deliverySidecarHttp.ts new file mode 100644 index 0000000000000..7e27162746000 --- /dev/null +++ b/apps/server/src/deliverySidecarHttp.ts @@ -0,0 +1,72 @@ +import * as Effect from "effect/Effect"; +import * as Option from "effect/Option"; +import { + FetchHttpClient, + HttpClient, + HttpClientRequest, + HttpRouter, + HttpServerRequest, + HttpServerResponse, +} from "effect/http"; + +import { EnvironmentAuth } from "./auth/EnvironmentAuth.ts"; + +const prefix = "/delivery-sidecar/v1/"; +const ticket = /^[A-Za-z0-9][A-Za-z0-9_-]{0,63}$/; +const pullRequest = /^pull-requests\/[a-z0-9-]+\/(?!\.{1,2}\/)[a-z0-9_.-]+\/[1-9][0-9]*$/i; +const managedRun = /^managed-runs\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/; +const headers = { "cache-control": "no-store" }; + +function configuredPort() { + return Number(process.env.T3CODE_DELIVERY_SIDECAR_PORT); +} + +export const layer = HttpRouter.add( + "GET", + "/delivery-sidecar/v1/*", + Effect.gen(function* () { + const request = yield* HttpServerRequest.HttpServerRequest; + const path = new URL(request.url, "http://127.0.0.1").pathname; + const resource = path.slice(prefix.length); + const port = configuredPort(); + if ( + !Number.isInteger(port) || + port < 1 || + port > 65535 || + !path.startsWith(prefix) || + !(ticket.test(resource) || pullRequest.test(resource) || managedRun.test(resource)) + ) { + return HttpServerResponse.empty({ status: 404, headers }); + } + + const auth = yield* EnvironmentAuth; + const session = yield* auth.authenticateHttpRequest(request).pipe(Effect.option); + if (Option.isNone(session)) { + return HttpServerResponse.empty({ status: 401, headers }); + } + if (!session.value.scopes.includes("orchestration:read")) { + return HttpServerResponse.empty({ status: 403, headers }); + } + + const client = yield* HttpClient.HttpClient; + const response = yield* client + .execute(HttpClientRequest.get(`http://127.0.0.1:${port}${prefix}${resource}`)) + .pipe( + Effect.flatMap((result) => + result.status === 200 + ? Effect.map(result.json, (body) => ({ status: result.status, body })) + : Effect.succeed({ status: result.status, body: null }), + ), + Effect.provideService(FetchHttpClient.RequestInit, { redirect: "error" }), + Effect.timeout("15 seconds"), + Effect.option, + ); + if (Option.isNone(response) || ![200, 404].includes(response.value.status)) { + return HttpServerResponse.empty({ status: 502, headers }); + } + if (response.value.status === 404) { + return HttpServerResponse.empty({ status: 404, headers }); + } + return HttpServerResponse.jsonUnsafe(response.value.body, { headers }); + }), +); diff --git a/apps/server/src/server.ts b/apps/server/src/server.ts index 23e91d378a3a3..579569043e15f 100644 --- a/apps/server/src/server.ts +++ b/apps/server/src/server.ts @@ -33,6 +33,7 @@ import * as NonBlockingSpawner from "./process/NonBlockingSpawner.ts"; import * as KeepAwake from "./background/KeepAwake.ts"; import * as ServerConfig from "./config.ts"; import { withUntracedRequests } from "./http.ts"; +import * as DeliverySidecarHttp from "./deliverySidecarHttp.ts"; import * as IsolatedApprovalHttp from "./isolatedApprovalHttp.ts"; import * as ServerHttp from "./http.ts"; import { @@ -839,6 +840,7 @@ const layerMakeRoutes = Layer.mergeAll( Layer.provide(AuthHttp.layerAuthenticatedAuth), ), IsolatedApprovalHttp.layer, + DeliverySidecarHttp.layer, ServerHttp.layerOtlpTracesProxyRoute, ServerHttp.layerAssetRoute, ServerHttp.layerAttachmentUploadRoute, diff --git a/apps/web/src/routes/_chat.delivery.tsx b/apps/web/src/routes/_chat.delivery.tsx index 3b8da2dbd2170..a2abfcfed878b 100644 --- a/apps/web/src/routes/_chat.delivery.tsx +++ b/apps/web/src/routes/_chat.delivery.tsx @@ -1,4 +1,10 @@ -import { createFileRoute, useNavigate, useRouter, useRouterState } from "@tanstack/react-router"; +import { + Link, + createFileRoute, + useNavigate, + useRouter, + useRouterState, +} from "@tanstack/react-router"; import type { ReactNode } from "react"; @@ -71,6 +77,7 @@ interface PullRequestDelivery { version: 1; pullRequest: { repository: string; number: number; head: string; url: string }; candidate: string | null; + managedRunId?: string; qa: { status: string; head?: string; freshness?: string }; ci: { status: string; head?: string; runId?: number }; previousCi?: { status: string; head: string; runId?: number } | null; @@ -121,6 +128,7 @@ function CiRunLink({ repository, runId }: { repository: string; runId?: number | function PullRequestEvidence({ delivery }: { delivery: PullRequestDelivery }) { const { pullRequest, candidate, qa, ci } = delivery; + const run = parseManagedRunId(delivery.managedRunId); const fields: ReadonlyArray = [ ["Current PR commit", pullRequest.head], ["Verified candidate", candidate ?? "No managed candidate"], @@ -152,6 +160,11 @@ function PullRequestEvidence({ delivery }: { delivery: PullRequestDelivery }) {

{pullRequest.repository} #{pullRequest.number}

+ {run && ( + + Open managed run + + )}
{fields.map(([label, value]) => (
From ef9ab4e47dae2b7f21ee8b108cebf11df579e64b Mon Sep 17 00:00:00 2001 From: InTheta <17220028+InTheta@users.noreply.github.com> Date: Tue, 17 Nov 2026 13:48:01 +0000 Subject: [PATCH 2/2] Authenticate Delivery reads from the packaged renderer --- apps/web/src/lib/deliverySidecarFetch.ts | 18 ++++++++++++++++++ apps/web/src/lib/managedRunDelivery.ts | 8 +++++--- apps/web/src/routes/_chat.delivery.tsx | 13 +++++++------ 3 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 apps/web/src/lib/deliverySidecarFetch.ts diff --git a/apps/web/src/lib/deliverySidecarFetch.ts b/apps/web/src/lib/deliverySidecarFetch.ts new file mode 100644 index 0000000000000..a203e30389ff4 --- /dev/null +++ b/apps/web/src/lib/deliverySidecarFetch.ts @@ -0,0 +1,18 @@ +import { readDesktopPrimaryBearerToken } from "~/environments/primary/desktopAuth"; +import { resolvePrimaryEnvironmentHttpUrl } from "~/environments/primary/target"; + +export async function fetchDeliverySidecar(path: string, signal: AbortSignal): Promise { + const request = { cache: "no-store", signal } as const; + if (typeof window === "undefined" || !window.desktopBridge || import.meta.env.DEV) { + return fetch(path, request); + } + + const url = resolvePrimaryEnvironmentHttpUrl(path); + const token = await readDesktopPrimaryBearerToken(); + return fetch(url, { + ...request, + credentials: "omit", + redirect: "error", + ...(token ? { headers: { Authorization: `Bearer ${token}` } } : {}), + }); +} diff --git a/apps/web/src/lib/managedRunDelivery.ts b/apps/web/src/lib/managedRunDelivery.ts index fd6efc1ec70f2..11b3bafa9bc42 100644 --- a/apps/web/src/lib/managedRunDelivery.ts +++ b/apps/web/src/lib/managedRunDelivery.ts @@ -1,5 +1,7 @@ import * as Schema from "effect/Schema"; +import { fetchDeliverySidecar } from "~/lib/deliverySidecarFetch"; + const uuid = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/; const CommitSha = Schema.String.check(Schema.isPattern(/^[0-9a-f]{40}$/)); const Tokens = Schema.Int.check(Schema.isBetween({ minimum: 0, maximum: Number.MAX_SAFE_INTEGER })); @@ -59,10 +61,10 @@ export async function readManagedRun( signal: AbortSignal, ): Promise { try { - const response = await fetch(`/delivery-sidecar/v1/managed-runs/${encodeURIComponent(runId)}`, { - cache: "no-store", + const response = await fetchDeliverySidecar( + `/delivery-sidecar/v1/managed-runs/${encodeURIComponent(runId)}`, signal, - }); + ); return response.ok ? parseManagedRun(await response.json(), runId) : null; } catch { return null; diff --git a/apps/web/src/routes/_chat.delivery.tsx b/apps/web/src/routes/_chat.delivery.tsx index a2abfcfed878b..5d774239fcc02 100644 --- a/apps/web/src/routes/_chat.delivery.tsx +++ b/apps/web/src/routes/_chat.delivery.tsx @@ -10,6 +10,7 @@ import type { ReactNode } from "react"; import { ManagedRunEvidence } from "~/components/ManagedRunEvidence"; import { deliveryCiRun, parseDeliveryPullRequestUrl } from "~/lib/deliveryPullRequest"; +import { fetchDeliverySidecar } from "~/lib/deliverySidecarFetch"; import { parseManagedRunId, readManagedRun } from "~/lib/managedRunDelivery"; interface Delivery { @@ -63,10 +64,10 @@ function readDeliveryShape(value: unknown, ticket: string): Delivery | null { async function readDelivery(ticket: string, signal: AbortSignal): Promise { try { - const response = await fetch(`/delivery-sidecar/v1/${encodeURIComponent(ticket)}`, { - cache: "no-store", + const response = await fetchDeliverySidecar( + `/delivery-sidecar/v1/${encodeURIComponent(ticket)}`, signal, - }); + ); return response.ok ? readDeliveryShape(await response.json(), ticket) : null; } catch { return null; @@ -88,10 +89,10 @@ async function readPullRequestDelivery(value: string, signal: AbortSignal) { if (!link) return null; const segments = link.repository.split("/").map(encodeURIComponent).join("/"); try { - const response = await fetch(`/delivery-sidecar/v1/pull-requests/${segments}/${link.number}`, { - cache: "no-store", + const response = await fetchDeliverySidecar( + `/delivery-sidecar/v1/pull-requests/${segments}/${link.number}`, signal, - }); + ); if (!response.ok) return null; const row = (await response.json()) as Partial | null; if (