| ... | @@ -1,8 +1,3 @@ | ... | @@ -1,8 +1,3 @@ |
| 1 | import { | | |
| 2 | RelayApi, | | |
| 3 | type RelayAgentActivityPublishProofPayload, | | |
| 4 | type RelayAgentActivityState, | | |
| 5 | } from "@t3tools/contracts/relay"; | | |
| 6 | import type { | 1 | import type { |
| 7 | EnvironmentId, | 2 | EnvironmentId, |
| 8 | OrchestrationEvent, | 3 | OrchestrationEvent, |
| ... | @@ -10,13 +5,18 @@ import type { | ... | @@ -10,13 +5,18 @@ import type { |
| 10 | OrchestrationThreadShell, | 5 | OrchestrationThreadShell, |
| 11 | ThreadId, | 6 | ThreadId, |
| 12 | } from "@t3tools/contracts"; | 7 | } from "@t3tools/contracts"; |
| | 8 | import { |
| | 9 | RelayApi, |
| | 10 | type RelayAgentActivityPublishProofPayload, |
| | 11 | type RelayAgentActivityState, |
| | 12 | } from "@t3tools/contracts/relay"; |
| 13 | import { projectThreadAwareness } from "@t3tools/shared/agentAwareness"; | 13 | import { projectThreadAwareness } from "@t3tools/shared/agentAwareness"; |
| 14 | import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker"; | 14 | import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker"; |
| 15 | import { withRelayClientTracing } from "@t3tools/shared/relayTracing"; | 15 | import { withRelayClientTracing } from "@t3tools/shared/relayTracing"; |
| 16 | import { | 16 | import { |
| | 17 | normalizeRelayIssuer, |
| 17 | RELAY_ACTIVITY_PUBLISH_TYP, | 18 | RELAY_ACTIVITY_PUBLISH_TYP, |
| 18 | signRelayJwt, | 19 | signRelayJwt, |
| 19 | normalizeRelayIssuer, | | |
| 20 | } from "@t3tools/shared/relayJwt"; | 20 | } from "@t3tools/shared/relayJwt"; |
| 21 | import * as Cause from "effect/Cause"; | 21 | import * as Cause from "effect/Cause"; |
| 22 | import * as Context from "effect/Context"; | 22 | import * as Context from "effect/Context"; |
| ... | @@ -28,31 +28,29 @@ import * as Option from "effect/Option"; | ... | @@ -28,31 +28,29 @@ import * as Option from "effect/Option"; |
| 28 | import * as Ref from "effect/Ref"; | 28 | import * as Ref from "effect/Ref"; |
| 29 | import type * as Scope from "effect/Scope"; | 29 | import type * as Scope from "effect/Scope"; |
| 30 | import * as Stream from "effect/Stream"; | 30 | import * as Stream from "effect/Stream"; |
| 31 | import { FetchHttpClient } from "effect/unstable/http"; | 31 | import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient"; |
| 32 | import * as HttpClient from "effect/unstable/http/HttpClient"; | 32 | import * as HttpClient from "effect/unstable/http/HttpClient"; |
| 33 | import * as HttpClientRequest from "effect/unstable/http/HttpClientRequest"; | 33 | import * as HttpClientRequest from "effect/unstable/http/HttpClientRequest"; |
| 34 | import * as HttpApiClient from "effect/unstable/httpapi/HttpApiClient"; | 34 | import * as HttpApiClient from "effect/unstable/httpapi/HttpApiClient"; |
| 35 | | 35 | |
| 36 | import * as ServerSecretStore from "../auth/ServerSecretStore.ts"; | 36 | import * as ServerSecretStore from "../auth/ServerSecretStore.ts"; |
| 37 | import { getOrCreateEnvironmentKeyPairFromSecretStore } from "../cloud/environmentKeys.ts"; | | |
| 38 | import { | 37 | import { |
| 39 | PUBLISH_AGENT_ACTIVITY_SECRET, | 38 | PUBLISH_AGENT_ACTIVITY_SECRET, |
| 40 | RELAY_ENVIRONMENT_CREDENTIAL_SECRET, | 39 | RELAY_ENVIRONMENT_CREDENTIAL_SECRET, |
| 41 | RELAY_ISSUER_SECRET, | 40 | RELAY_ISSUER_SECRET, |
| 42 | RELAY_URL_SECRET, | 41 | RELAY_URL_SECRET, |
| 43 | } from "../cloud/config.ts"; | 42 | } from "../cloud/config.ts"; |
| 44 | import { ServerEnvironment } from "../environment/Services/ServerEnvironment.ts"; | 43 | import { getOrCreateEnvironmentKeyPairFromSecretStore } from "../cloud/environmentKeys.ts"; |
| 45 | import { OrchestrationEngineService } from "../orchestration/Services/OrchestrationEngine.ts"; | 44 | import * as ServerEnvironment from "../environment/Services/ServerEnvironment.ts"; |
| 46 | import { ProjectionSnapshotQuery } from "../orchestration/Services/ProjectionSnapshotQuery.ts"; | 45 | import * as OrchestrationEngine from "../orchestration/Services/OrchestrationEngine.ts"; |
| 47 | | 46 | import * as ProjectionSnapshotQuery from "../orchestration/Services/ProjectionSnapshotQuery.ts"; |
| 48 | export interface AgentAwarenessRelayShape { | | |
| 49 | readonly publishThread: (threadId: ThreadId) => Effect.Effect<void>; | | |
| 50 | readonly start: () => Effect.Effect<void, never, Scope.Scope>; | | |
| 51 | } | | |
| 52 | | 47 | |
| 53 | export class AgentAwarenessRelay extends Context.Service< | 48 | export class AgentAwarenessRelay extends Context.Service< |
| 54 | AgentAwarenessRelay, | 49 | AgentAwarenessRelay, |
| 55 | AgentAwarenessRelayShape | 50 | { |
| | 51 | readonly publishThread: (threadId: ThreadId) => Effect.Effect<void>; |
| | 52 | readonly start: () => Effect.Effect<void, never, Scope.Scope>; |
| | 53 | } |
| 56 | >()("t3/relay/AgentAwarenessRelay") {} | 54 | >()("t3/relay/AgentAwarenessRelay") {} |
| 57 | | 55 | |
| 58 | export function eventThreadId(event: OrchestrationEvent): ThreadId | null { | 56 | export function eventThreadId(event: OrchestrationEvent): ThreadId | null { |
| ... | @@ -265,11 +263,11 @@ export function resolveAgentAwarenessRelayActiveThreadIds(input: { | ... | @@ -265,11 +263,11 @@ export function resolveAgentAwarenessRelayActiveThreadIds(input: { |
| 265 | .map((thread) => thread.id); | 263 | .map((thread) => thread.id); |
| 266 | } | 264 | } |
| 267 | | 265 | |
| 268 | const make = Effect.gen(function* () { | 266 | export const make = Effect.gen(function* () { |
| 269 | const secrets = yield* ServerSecretStore.ServerSecretStore; | 267 | const secrets = yield* ServerSecretStore.ServerSecretStore; |
| 270 | const serverEnvironment = yield* ServerEnvironment; | 268 | const serverEnvironment = yield* ServerEnvironment.ServerEnvironment; |
| 271 | const snapshotQuery = yield* ProjectionSnapshotQuery; | 269 | const snapshotQuery = yield* ProjectionSnapshotQuery.ProjectionSnapshotQuery; |
| 272 | const orchestrationEngine = yield* OrchestrationEngineService; | 270 | const orchestrationEngine = yield* OrchestrationEngine.OrchestrationEngineService; |
| 273 | const crypto = yield* Crypto.Crypto; | 271 | const crypto = yield* Crypto.Crypto; |
| 274 | const cloudLinkKeyPair = yield* getOrCreateEnvironmentKeyPairFromSecretStore(secrets); | 272 | const cloudLinkKeyPair = yield* getOrCreateEnvironmentKeyPairFromSecretStore(secrets); |
| 275 | const activeSnapshotPublishedRef = yield* Ref.make(false); | 273 | const activeSnapshotPublishedRef = yield* Ref.make(false); |
| ... | @@ -417,7 +415,7 @@ const make = Effect.gen(function* () { | ... | @@ -417,7 +415,7 @@ const make = Effect.gen(function* () { |
| 417 | }); | 415 | }); |
| 418 | }); | 416 | }); |
| 419 | | 417 | |
| 420 | const publishThread: AgentAwarenessRelayShape["publishThread"] = (threadId) => | 418 | const publishThread: AgentAwarenessRelay["Service"]["publishThread"] = (threadId) => |
| 421 | publishThreadUnsafe(threadId).pipe( | 419 | publishThreadUnsafe(threadId).pipe( |
| 422 | Effect.catchCause((cause) => { | 420 | Effect.catchCause((cause) => { |
| 423 | return Effect.logWarning("agent activity publish failed", { | 421 | return Effect.logWarning("agent activity publish failed", { |
| ... | @@ -480,7 +478,7 @@ const make = Effect.gen(function* () { | ... | @@ -480,7 +478,7 @@ const make = Effect.gen(function* () { |
| 480 | | 478 | |
| 481 | const worker = yield* makeDrainableWorker(publishThread); | 479 | const worker = yield* makeDrainableWorker(publishThread); |
| 482 | | 480 | |
| 483 | const start: AgentAwarenessRelayShape["start"] = Effect.fn("AgentAwarenessRelay.start")( | 481 | const start: AgentAwarenessRelay["Service"]["start"] = Effect.fn("AgentAwarenessRelay.start")( |
| 484 | function* () { | 482 | function* () { |
| 485 | const [relayConfig, publishEnabled] = yield* Effect.all([ | 483 | const [relayConfig, publishEnabled] = yield* Effect.all([ |
| 486 | readRelayConfig.pipe(Effect.orElseSucceed(() => null)), | 484 | readRelayConfig.pipe(Effect.orElseSucceed(() => null)), |
| ... | @@ -536,10 +534,10 @@ const make = Effect.gen(function* () { | ... | @@ -536,10 +534,10 @@ const make = Effect.gen(function* () { |
| 536 | }, | 534 | }, |
| 537 | ); | 535 | ); |
| 538 | | 536 | |
| 539 | return { | 537 | return AgentAwarenessRelay.of({ |
| 540 | publishThread, | 538 | publishThread, |
| 541 | start, | 539 | start, |
| 542 | } satisfies AgentAwarenessRelayShape; | 540 | }); |
| 543 | }); | 541 | }); |
| 544 | | 542 | |
| 545 | export const layer = Layer.effect(AgentAwarenessRelay, make); | 543 | export const layer = Layer.effect(AgentAwarenessRelay, make); |
Julius Marminge <julius0216@outlook.com> 2026-06-19 21:18:55-07:00
GitHub <noreply@github.com> 2026-06-19 21:18:55-07:00