Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.
more effect: new service graph
Julius Marminge150b3782b942
diff --git a/apps/server/src/checkpointing/Errors.ts b/apps/server/src/checkpointing/Errors.tsnew file mode 100644index 000000000..584ce90b7--- /dev/null+++ b/apps/server/src/checkpointing/Errors.ts@@ -0,0 +1,148 @@+import { Schema } from "effect";++/**+ * CheckpointValidationError - Invalid checkpoint API input.+ */+export class CheckpointValidationError extends Schema.TaggedErrorClass<CheckpointValidationError>()(+ "CheckpointValidationError",+ {+ operation: Schema.String,+ issue: Schema.String,+ cause: Schema.optional(Schema.Defect),+ },+) {+ override get message(): string {+ return `Checkpoint validation failed in ${this.operation}: ${this.issue}`;+ }+}++/**+ * CheckpointGitCommandError - Git command execution failed in checkpoint store.+ */+export class CheckpointGitCommandError extends Schema.TaggedErrorClass<CheckpointGitCommandError>()(+ "CheckpointGitCommandError",+ {+ operation: Schema.String,+ command: Schema.String,+ cwd: Schema.String,+ detail: Schema.String,+ cause: Schema.optional(Schema.Defect),+ },+) {+ override get message(): string {+ return `Checkpoint git command failed in ${this.operation}: ${this.command} (${this.cwd}) - ${this.detail}`;+ }+}++/**+ * CheckpointUnavailableError - Expected checkpoint does not exist.+ */+export class CheckpointUnavailableError extends Schema.TaggedErrorClass<CheckpointUnavailableError>()(+ "CheckpointUnavailableError",+ {+ threadId: Schema.String,+ turnCount: Schema.Number,+ detail: Schema.String,+ cause: Schema.optional(Schema.Defect),+ },+) {+ override get message(): string {+ return `Checkpoint unavailable for thread ${this.threadId} turn ${this.turnCount}: ${this.detail}`;+ }+}++/**+ * CheckpointRepositoryError - Checkpointing unavailable for cwd/repository.+ */+export class CheckpointRepositoryError extends Schema.TaggedErrorClass<CheckpointRepositoryError>()(+ "CheckpointRepositoryError",+ {+ cwd: Schema.String,+ detail: Schema.String,+ cause: Schema.optional(Schema.Defect),+ },+) {+ override get message(): string {+ return `Checkpoint repository error for ${this.cwd}: ${this.detail}`;+ }+}++/**+ * CheckpointCatalogPersistenceError - Metadata persistence/read failure.+ */+export class CheckpointCatalogPersistenceError extends Schema.TaggedErrorClass<CheckpointCatalogPersistenceError>()(+ "CheckpointCatalogPersistenceError",+ {+ operation: Schema.String,+ detail: Schema.String,+ cause: Schema.optional(Schema.Defect),+ },+) {+ override get message(): string {+ return `Checkpoint catalog persistence error in ${this.operation}: ${this.detail}`;+ }+}++/**+ * CheckpointServiceValidationError - Invalid application-level checkpoint request.+ */+export class CheckpointServiceValidationError extends Schema.TaggedErrorClass<CheckpointServiceValidationError>()(+ "CheckpointServiceValidationError",+ {+ operation: Schema.String,+ issue: Schema.String,+ cause: Schema.optional(Schema.Defect),+ },+) {+ override get message(): string {+ return `Checkpoint service validation failed in ${this.operation}: ${this.issue}`;+ }+}++/**+ * CheckpointSessionNotFoundError - Session is missing in checkpoint workflow.+ */+export class CheckpointSessionNotFoundError extends Schema.TaggedErrorClass<CheckpointSessionNotFoundError>()(+ "CheckpointSessionNotFoundError",+ {+ sessionId: Schema.String,+ cause: Schema.optional(Schema.Defect),+ },+) {+ override get message(): string {+ return `Checkpoint session not found: ${this.sessionId}`;+ }+}++/**+ * CheckpointInvariantError - Inconsistent provider/filesystem/catalog state.+ */+export class CheckpointInvariantError extends Schema.TaggedErrorClass<CheckpointInvariantError>()(+ "CheckpointInvariantError",+ {+ operation: Schema.String,+ detail: Schema.String,+ cause: Schema.optional(Schema.Defect),+ },+) {+ override get message(): string {+ return `Checkpoint invariant violation in ${this.operation}: ${this.detail}`;+ }+}++export type CheckpointStoreError =+ | CheckpointValidationError+ | CheckpointGitCommandError+ | CheckpointUnavailableError+ | CheckpointRepositoryError;++export type CheckpointCatalogError =+ | CheckpointValidationError+ | CheckpointCatalogPersistenceError;++export type CheckpointServiceError =+ | CheckpointStoreError+ | CheckpointCatalogError+ | CheckpointServiceValidationError+ | CheckpointSessionNotFoundError+ | CheckpointInvariantError;diff --git a/apps/server/src/checkpointing/Services/CheckpointCatalog.ts b/apps/server/src/checkpointing/Services/CheckpointCatalog.tsnew file mode 100644index 000000000..b9e00e08a--- /dev/null+++ b/apps/server/src/checkpointing/Services/CheckpointCatalog.ts@@ -0,0 +1,83 @@+/**+ * CheckpointCatalog - Metadata repository for checkpoints.+ *+ * Stores user-facing checkpoint metadata used by list/revert APIs. It does not+ * touch the filesystem or hidden Git refs; `CheckpointStore` owns that state.+ * It also does not drive provider conversation rollback.+ *+ * @module CheckpointCatalog+ */+import type { ProviderCheckpoint } from "@t3tools/contracts";+import { Option, ServiceMap } from "effect";+import type { Effect } from "effect";++import type { CheckpointCatalogError } from "../Errors.ts";++export interface UpsertCheckpointInput {+ readonly providerSessionId: string;+ readonly threadId: string;+ readonly turnCount: number;+ readonly messageCount: number;+ readonly label: string;+ readonly preview?: string;+ readonly createdAt: string;+}++export interface ListSessionCheckpointsInput {+ readonly providerSessionId: string;+}++export interface GetCheckpointInput {+ readonly providerSessionId: string;+ readonly turnCount: number;+}++export interface DeleteAfterTurnInput {+ readonly providerSessionId: string;+ readonly maxTurnCount: number;+}++export interface DeleteAllForSessionInput {+ readonly providerSessionId: string;+}++export interface CheckpointCatalogShape {+ /**+ * Insert or update one checkpoint metadata row.+ */+ readonly upsertCheckpoint: (input: UpsertCheckpointInput) => Effect.Effect<void, CheckpointCatalogError>;++ /**+ * List checkpoints for a provider session.+ */+ readonly listCheckpoints: (+ input: ListSessionCheckpointsInput,+ ) => Effect.Effect<ReadonlyArray<ProviderCheckpoint>, CheckpointCatalogError>;++ /**+ * Read one checkpoint by turn count.+ */+ readonly getCheckpoint: (+ input: GetCheckpointInput,+ ) => Effect.Effect<Option.Option<ProviderCheckpoint>, CheckpointCatalogError>;++ /**+ * Delete checkpoint metadata newer than the provided turn count.+ */+ readonly deleteAfterTurn: (input: DeleteAfterTurnInput) => Effect.Effect<void, CheckpointCatalogError>;++ /**+ * Delete all checkpoint metadata for a provider session.+ */+ readonly deleteAllForSession: (+ input: DeleteAllForSessionInput,+ ) => Effect.Effect<void, CheckpointCatalogError>;+}++/**+ * CheckpointCatalog - Service tag for checkpoint metadata persistence.+ */+export class CheckpointCatalog extends ServiceMap.Service<+ CheckpointCatalog,+ CheckpointCatalogShape+>()("checkpointing/CheckpointCatalog") {}diff --git a/apps/server/src/checkpointing/Services/CheckpointService.ts b/apps/server/src/checkpointing/Services/CheckpointService.tsnew file mode 100644index 000000000..4622b1d18--- /dev/null+++ b/apps/server/src/checkpointing/Services/CheckpointService.ts@@ -0,0 +1,78 @@+/**+ * CheckpointService - Application orchestrator for checkpoint workflows.+ *+ * Coordinates `CheckpointStore` (Git refs), `CheckpointCatalog` (metadata), and+ * provider timeline operations resolved through `ProviderSessionDirectory` and+ * `ProviderAdapterRegistry` (read/rollback/hasSession on adapters).+ *+ * This service owns checkpoint workflow rules and validation, while concrete+ * storage/process details stay in lower-level services.+ *+ * @module CheckpointService+ */+import type {+ ProviderGetCheckpointDiffInput,+ ProviderGetCheckpointDiffResult,+ ProviderListCheckpointsInput,+ ProviderListCheckpointsResult,+ ProviderRevertToCheckpointInput,+ ProviderRevertToCheckpointResult,+} from "@t3tools/contracts";+import { ServiceMap } from "effect";+import type { Effect } from "effect";++import type { CheckpointServiceError } from "../Errors.ts";++export interface InitializeCheckpointSessionInput {+ readonly providerSessionId: string;+ readonly cwd: string;+}++export interface CaptureCurrentTurnInput {+ readonly providerSessionId: string;+ readonly turnId?: string;+ readonly status?: string;+}++export interface CheckpointServiceShape {+ /**+ * Initialize root checkpoint and metadata for a provider session.+ */+ readonly initializeForSession: (+ input: InitializeCheckpointSessionInput,+ ) => Effect.Effect<void, CheckpointServiceError>;++ /**+ * Capture the current thread turn into checkpoint refs/metadata.+ */+ readonly captureCurrentTurn: (input: CaptureCurrentTurnInput) => Effect.Effect<void, CheckpointServiceError>;++ /**+ * List checkpoints for a provider session.+ */+ readonly listCheckpoints: (+ input: ProviderListCheckpointsInput,+ ) => Effect.Effect<ProviderListCheckpointsResult, CheckpointServiceError>;++ /**+ * Diff two checkpoint turn counts for a provider session.+ */+ readonly getCheckpointDiff: (+ input: ProviderGetCheckpointDiffInput,+ ) => Effect.Effect<ProviderGetCheckpointDiffResult, CheckpointServiceError>;++ /**+ * Revert provider/filesystem state to a checkpoint.+ */+ readonly revertToCheckpoint: (+ input: ProviderRevertToCheckpointInput,+ ) => Effect.Effect<ProviderRevertToCheckpointResult, CheckpointServiceError>;+}++/**+ * CheckpointService - Service tag for checkpoint orchestration.+ */+export class CheckpointService extends ServiceMap.Service<+ CheckpointService,+ CheckpointServiceShape+>()("checkpointing/CheckpointService") {}diff --git a/apps/server/src/provider/Services/CheckpointStore.ts b/apps/server/src/checkpointing/Services/CheckpointStore.tssimilarity index 86%rename from apps/server/src/provider/Services/CheckpointStore.tsrename to apps/server/src/checkpointing/Services/CheckpointStore.tsindex 98bbacbed..81fa60c30 100644--- a/apps/server/src/provider/Services/CheckpointStore.ts+++ b/apps/server/src/checkpointing/Services/CheckpointStore.ts@@ -1,8 +1,12 @@/*** CheckpointStore - Repository interface for filesystem-backed workspace checkpoints.*+ * Owns hidden Git-ref checkpoint capture/restore and diff computation for a+ * workspace thread timeline. It does not store user-facing checkpoint metadata+ * and does not coordinate provider conversation rollback.+ ** Uses Effect `ServiceMap.Service` for dependency injection and exposes typed- * domain errors for checkpoint lifecycle operations.+ * domain errors for checkpoint storage operations.** @module CheckpointStore*/@@ -83,9 +87,9 @@ export interface CheckpointStoreShape {}/**- * CheckpointStore - Context tag for checkpoint persistence and restore operations.+ * CheckpointStore - Service tag for checkpoint persistence and restore operations.*/export class CheckpointStore extends ServiceMap.Service<CheckpointStore,CheckpointStoreShape->()("provider/CheckpointStore") {}+>()("checkpointing/CheckpointStore") {}diff --git a/apps/server/src/orchestration/Service.ts b/apps/server/src/orchestration/Service.tsindex 1dadacce9..e841d3afd 100644--- a/apps/server/src/orchestration/Service.ts+++ b/apps/server/src/orchestration/Service.ts@@ -1,7 +1,11 @@/*** OrchestrationEngineService - Service interface for orchestration command handling.*- * Uses Effect `Context.Tag` for dependency injection. Command dispatch,+ * Owns command validation/dispatch and in-memory read-model updates backed by+ * `OrchestrationEventRepository` persistence. It does not own provider process+ * management or transport concerns (e.g. websocket request parsing).+ *+ * Uses Effect `ServiceMap.Service` for dependency injection. Command dispatch,* replay, and unknown-input decoding all return typed domain errors.** @module OrchestrationEngineService@@ -79,7 +83,7 @@ export interface OrchestrationEngineShape {}/**- * OrchestrationEngineService - Context tag for orchestration engine access.+ * OrchestrationEngineService - Service tag for orchestration engine access.** @example* ```tsdiff --git a/apps/server/src/persistence/Services/OrchestrationEvents.ts b/apps/server/src/persistence/Services/OrchestrationEvents.tsindex 6761bf982..88545f142 100644--- a/apps/server/src/persistence/Services/OrchestrationEvents.ts+++ b/apps/server/src/persistence/Services/OrchestrationEvents.ts@@ -1,7 +1,10 @@/*** OrchestrationEventRepository - Repository interface for orchestration events.*- * Uses Effect `Context.Tag` for dependency injection and exposes typed+ * Owns durable append/replay access to the orchestration event stream. It does+ * not reduce events into read models or apply command validation rules.+ *+ * Uses Effect `ServiceMap.Service` for dependency injection and exposes typed* persistence/decode errors for event append and replay operations.** @module OrchestrationEventRepository@@ -44,7 +47,7 @@ export interface OrchestrationEventRepositoryShape {}/**- * OrchestrationEventRepository - Context tag for orchestration event persistence.+ * OrchestrationEventRepository - Service tag for orchestration event persistence.** @example* ```tsdiff --git a/apps/server/src/persistence/Services/Projects.ts b/apps/server/src/persistence/Services/Projects.tsindex 5f8a67c78..c27ddab04 100644--- a/apps/server/src/persistence/Services/Projects.ts+++ b/apps/server/src/persistence/Services/Projects.ts@@ -1,7 +1,10 @@/*** ProjectRepository - Repository interface for project persistence.*- * Uses Effect `Context.Tag` for dependency injection and returns typed+ * Owns persisted project records (cwd, scripts, and cleanup of missing paths).+ * It does not manage provider sessions, orchestration events, or websocket APIs.+ *+ * Uses Effect `ServiceMap.Service` for dependency injection and returns typed* domain errors for all operations.** @module ProjectRepository@@ -62,7 +65,7 @@ export interface ProjectRepositoryShape {}/**- * ProjectRepository - Context tag for project persistence dependency injection.+ * ProjectRepository - Service tag for project persistence dependency injection.** @example* ```tsdiff --git a/apps/server/src/provider/Errors.ts b/apps/server/src/provider/Errors.tsindex 9655b1f65..6339abc05 100644--- a/apps/server/src/provider/Errors.ts+++ b/apps/server/src/provider/Errors.ts@@ -1,163 +1,104 @@import { Schema } from "effect";-/**- * CheckpointValidationError - Invalid checkpoint API input.- */-export class CheckpointValidationError extends Schema.TaggedErrorClass<CheckpointValidationError>()(- "CheckpointValidationError",- {- operation: Schema.String,- issue: Schema.String,- cause: Schema.optional(Schema.Defect),- },-) {- override get message(): string {- return `Checkpoint validation failed in ${this.operation}: ${this.issue}`;- }-}--/**- * CheckpointGitCommandError - Git command execution failed in checkpoint store.- */-export class CheckpointGitCommandError extends Schema.TaggedErrorClass<CheckpointGitCommandError>()(- "CheckpointGitCommandError",- {- operation: Schema.String,- command: Schema.String,- cwd: Schema.String,- detail: Schema.String,- cause: Schema.optional(Schema.Defect),- },-) {- override get message(): string {- return `Checkpoint git command failed in ${this.operation}: ${this.command} (${this.cwd}) - ${this.detail}`;- }-}--/**- * CheckpointUnavailableError - Expected checkpoint does not exist.- */-export class CheckpointUnavailableError extends Schema.TaggedErrorClass<CheckpointUnavailableError>()(- "CheckpointUnavailableError",- {- threadId: Schema.String,- turnCount: Schema.Number,- detail: Schema.String,- cause: Schema.optional(Schema.Defect),- },-) {- override get message(): string {- return `Checkpoint unavailable for thread ${this.threadId} turn ${this.turnCount}: ${this.detail}`;- }-}--/**- * CheckpointRepositoryError - Checkpointing unavailable for cwd/repository.- */-export class CheckpointRepositoryError extends Schema.TaggedErrorClass<CheckpointRepositoryError>()(- "CheckpointRepositoryError",- {- cwd: Schema.String,- detail: Schema.String,- cause: Schema.optional(Schema.Defect),- },-) {- override get message(): string {- return `Checkpoint repository error for ${this.cwd}: ${this.detail}`;- }-}+import type { CheckpointServiceError } from "../checkpointing/Errors.ts";/**- * CodexValidationError - Invalid Codex API input.+ * ProviderAdapterValidationError - Invalid adapter API input.*/-export class CodexValidationError extends Schema.TaggedErrorClass<CodexValidationError>()(- "CodexValidationError",+export class ProviderAdapterValidationError extends Schema.TaggedErrorClass<ProviderAdapterValidationError>()(+ "ProviderAdapterValidationError",{+ provider: Schema.String,operation: Schema.String,issue: Schema.String,cause: Schema.optional(Schema.Defect),},) {override get message(): string {- return `Codex validation failed in ${this.operation}: ${this.issue}`;+ return `Provider adapter validation failed (${this.provider}) in ${this.operation}: ${this.issue}`;}}/**- * CodexSessionNotFoundError - Session id is unknown.+ * ProviderAdapterSessionNotFoundError - Adapter-owned session id is unknown.*/-export class CodexSessionNotFoundError extends Schema.TaggedErrorClass<CodexSessionNotFoundError>()(- "CodexSessionNotFoundError",+export class ProviderAdapterSessionNotFoundError extends Schema.TaggedErrorClass<ProviderAdapterSessionNotFoundError>()(+ "ProviderAdapterSessionNotFoundError",{+ provider: Schema.String,sessionId: Schema.String,cause: Schema.optional(Schema.Defect),},) {override get message(): string {- return `Unknown codex session: ${this.sessionId}`;+ return `Unknown ${this.provider} adapter session: ${this.sessionId}`;}}/**- * CodexSessionClosedError - Session exists but is closed.+ * ProviderAdapterSessionClosedError - Adapter session exists but is closed.*/-export class CodexSessionClosedError extends Schema.TaggedErrorClass<CodexSessionClosedError>()(- "CodexSessionClosedError",+export class ProviderAdapterSessionClosedError extends Schema.TaggedErrorClass<ProviderAdapterSessionClosedError>()(+ "ProviderAdapterSessionClosedError",{+ provider: Schema.String,sessionId: Schema.String,cause: Schema.optional(Schema.Defect),},) {override get message(): string {- return `Codex session is closed: ${this.sessionId}`;+ return `${this.provider} adapter session is closed: ${this.sessionId}`;}}/**- * CodexProtocolError - Invalid/unexpected JSON-RPC payload from app-server.+ * ProviderAdapterProtocolError - Invalid/unexpected provider protocol payload.*/-export class CodexProtocolError extends Schema.TaggedErrorClass<CodexProtocolError>()(- "CodexProtocolError",+export class ProviderAdapterProtocolError extends Schema.TaggedErrorClass<ProviderAdapterProtocolError>()(+ "ProviderAdapterProtocolError",{+ provider: Schema.String,operation: Schema.String,detail: Schema.String,cause: Schema.optional(Schema.Defect),},) {override get message(): string {- return `Codex protocol error in ${this.operation}: ${this.detail}`;+ return `Provider adapter protocol error (${this.provider}) in ${this.operation}: ${this.detail}`;}}/**- * CodexRequestError - JSON-RPC request failed or timed out.+ * ProviderAdapterRequestError - Provider protocol request failed or timed out.*/-export class CodexRequestError extends Schema.TaggedErrorClass<CodexRequestError>()(- "CodexRequestError",+export class ProviderAdapterRequestError extends Schema.TaggedErrorClass<ProviderAdapterRequestError>()(+ "ProviderAdapterRequestError",{+ provider: Schema.String,method: Schema.String,detail: Schema.String,cause: Schema.optional(Schema.Defect),},) {override get message(): string {- return `Codex request failed for ${this.method}: ${this.detail}`;+ return `Provider adapter request failed (${this.provider}) for ${this.method}: ${this.detail}`;}}/**- * CodexProcessError - codex app-server process lifecycle failure.+ * ProviderAdapterProcessError - Provider process lifecycle failure.*/-export class CodexProcessError extends Schema.TaggedErrorClass<CodexProcessError>()(- "CodexProcessError",+export class ProviderAdapterProcessError extends Schema.TaggedErrorClass<ProviderAdapterProcessError>()(+ "ProviderAdapterProcessError",{+ provider: Schema.String,sessionId: Schema.String,detail: Schema.String,cause: Schema.optional(Schema.Defect),},) {override get message(): string {- return `Codex process error for session ${this.sessionId}: ${this.detail}`;+ return `Provider adapter process error (${this.provider}) for session ${this.sessionId}: ${this.detail}`;}}@@ -257,19 +198,13 @@ export class ProviderFilesystemError extends Schema.TaggedErrorClass<ProviderFil}}-export type CheckpointStoreError =- | CheckpointValidationError- | CheckpointGitCommandError- | CheckpointUnavailableError- | CheckpointRepositoryError;--export type CodexServiceError =- | CodexValidationError- | CodexSessionNotFoundError- | CodexSessionClosedError- | CodexProtocolError- | CodexRequestError- | CodexProcessError;+export type ProviderAdapterError =+ | ProviderAdapterValidationError+ | ProviderAdapterSessionNotFoundError+ | ProviderAdapterSessionClosedError+ | ProviderAdapterProtocolError+ | ProviderAdapterRequestError+ | ProviderAdapterProcessError;export type ProviderServiceError =| ProviderValidationError@@ -278,5 +213,5 @@ export type ProviderServiceError =| ProviderCheckpointUnavailableError| ProviderCheckpointRangeError| ProviderFilesystemError- | CodexServiceError- | CheckpointStoreError;+ | ProviderAdapterError+ | CheckpointServiceError;diff --git a/apps/server/src/provider/Services/Codex.ts b/apps/server/src/provider/Services/Codex.tsdeleted file mode 100644index 06a556fa3..000000000--- a/apps/server/src/provider/Services/Codex.ts+++ /dev/null@@ -1,110 +0,0 @@-/**- * CodexService - Service interface for codex app-server session lifecycle and RPC.- *- * Uses Effect `ServiceMap.Service` for dependency injection and returns typed- * domain errors for process, protocol, and session operations.- *- * @module CodexService- */-import type {- ProviderApprovalDecision,- ProviderEvent,- ProviderSendTurnInput,- ProviderSession,- ProviderSessionStartInput,- ProviderTurnStartResult,-} from "@t3tools/contracts";-import { ServiceMap } from "effect";-import type { Effect } from "effect";--import type { CodexServiceError } from "../Errors.ts";--export interface CodexThreadTurnSnapshot {- readonly id: string;- readonly items: ReadonlyArray<unknown>;-}--export interface CodexThreadSnapshot {- readonly threadId: string;- readonly turns: ReadonlyArray<CodexThreadTurnSnapshot>;-}--export interface CodexServiceShape {- /**- * Start a codex app-server-backed provider session.- */- readonly startSession: (- input: ProviderSessionStartInput,- ) => Effect.Effect<ProviderSession, CodexServiceError>;-- /**- * Send a new turn to an active codex session.- */- readonly sendTurn: (- input: ProviderSendTurnInput,- ) => Effect.Effect<ProviderTurnStartResult, CodexServiceError>;-- /**- * Interrupt an active turn.- */- readonly interruptTurn: (- sessionId: string,- turnId?: string,- ) => Effect.Effect<void, CodexServiceError>;-- /**- * Read a thread snapshot (including turns).- */- readonly readThread: (sessionId: string) => Effect.Effect<CodexThreadSnapshot, CodexServiceError>;-- /**- * Roll back a thread by N turns.- */- readonly rollbackThread: (- sessionId: string,- numTurns: number,- ) => Effect.Effect<CodexThreadSnapshot, CodexServiceError>;-- /**- * Respond to an interactive approval request from codex app-server.- */- readonly respondToRequest: (- sessionId: string,- requestId: string,- decision: ProviderApprovalDecision,- ) => Effect.Effect<void, CodexServiceError>;-- /**- * Stop one session.- */- readonly stopSession: (sessionId: string) => Effect.Effect<void, CodexServiceError>;-- /**- * List active sessions.- */- readonly listSessions: () => Effect.Effect<ReadonlyArray<ProviderSession>>;-- /**- * Check whether session id is currently active.- */- readonly hasSession: (sessionId: string) => Effect.Effect<boolean>;-- /**- * Stop all sessions.- */- readonly stopAll: () => Effect.Effect<void, CodexServiceError>;-- /**- * Subscribe to provider events emitted by codex app-server.- */- readonly subscribeToEvents: (- callback: (event: ProviderEvent) => void,- ) => Effect.Effect<() => void, CodexServiceError>;-}--/**- * CodexService - Context tag for codex session and RPC operations.- */-export class CodexService extends ServiceMap.Service<CodexService, CodexServiceShape>()(- "provider/CodexService",-) {}diff --git a/apps/server/src/provider/Services/CodexAdapter.ts b/apps/server/src/provider/Services/CodexAdapter.tsnew file mode 100644index 000000000..2c33eabb7--- /dev/null+++ b/apps/server/src/provider/Services/CodexAdapter.ts@@ -0,0 +1,27 @@+/**+ * CodexAdapter - Codex implementation of the generic provider adapter contract.+ *+ * This service owns Codex app-server process / JSON-RPC semantics and emits+ * Codex provider events. It does not perform cross-provider routing, shared+ * event fan-out, or checkpoint orchestration.+ *+ * Uses Effect `ServiceMap.Service` for dependency injection and returns the+ * shared provider-adapter error channel with `provider: "codex"` context.+ *+ * @module CodexAdapter+ */+import { ServiceMap } from "effect";++import type { ProviderAdapterError } from "../Errors.ts";+import type { ProviderAdapterShape } from "./ProviderAdapter.ts";++export interface CodexAdapterShape extends ProviderAdapterShape<ProviderAdapterError> {+ readonly provider: "codex";+}++/**+ * CodexAdapter - Service tag for Codex provider adapter operations.+ */+export class CodexAdapter extends ServiceMap.Service<CodexAdapter, CodexAdapterShape>()(+ "provider/CodexAdapter",+) {}diff --git a/apps/server/src/provider/Services/ProviderAdapter.ts b/apps/server/src/provider/Services/ProviderAdapter.tsnew file mode 100644index 000000000..21b6d8c3d--- /dev/null+++ b/apps/server/src/provider/Services/ProviderAdapter.ts@@ -0,0 +1,104 @@+/**+ * ProviderAdapter - Provider-specific runtime adapter contract.+ *+ * Defines the provider-native session/protocol operations that `ProviderService`+ * routes to after resolving the target provider. Implementations should focus+ * on provider behavior only and avoid cross-provider orchestration concerns.+ *+ * @module ProviderAdapter+ */+import type {+ ProviderApprovalDecision,+ ProviderEvent,+ ProviderKind,+ ProviderSendTurnInput,+ ProviderSession,+ ProviderSessionStartInput,+ ProviderTurnStartResult,+} from "@t3tools/contracts";+import type { Effect } from "effect";++export interface ProviderThreadTurnSnapshot {+ readonly id: string;+ readonly items: ReadonlyArray<unknown>;+}++export interface ProviderThreadSnapshot {+ readonly threadId: string;+ readonly turns: ReadonlyArray<ProviderThreadTurnSnapshot>;+}++export interface ProviderAdapterShape<TError> {+ /**+ * Provider kind implemented by this adapter.+ */+ readonly provider: ProviderKind;++ /**+ * Start a provider-backed session.+ */+ readonly startSession: (+ input: ProviderSessionStartInput,+ ) => Effect.Effect<ProviderSession, TError>;++ /**+ * Send a turn to an active provider session.+ */+ readonly sendTurn: (+ input: ProviderSendTurnInput,+ ) => Effect.Effect<ProviderTurnStartResult, TError>;++ /**+ * Interrupt an active turn.+ */+ readonly interruptTurn: (sessionId: string, turnId?: string) => Effect.Effect<void, TError>;++ /**+ * Respond to an interactive approval request.+ */+ readonly respondToRequest: (+ sessionId: string,+ requestId: string,+ decision: ProviderApprovalDecision,+ ) => Effect.Effect<void, TError>;++ /**+ * Stop one provider session.+ */+ readonly stopSession: (sessionId: string) => Effect.Effect<void, TError>;++ /**+ * List currently active provider sessions for this adapter.+ */+ readonly listSessions: () => Effect.Effect<ReadonlyArray<ProviderSession>>;++ /**+ * Check whether this adapter owns an active session id.+ */+ readonly hasSession: (sessionId: string) => Effect.Effect<boolean>;++ /**+ * Read a provider thread snapshot.+ */+ readonly readThread: (sessionId: string) => Effect.Effect<ProviderThreadSnapshot, TError>;++ /**+ * Roll back a provider thread by N turns.+ */+ readonly rollbackThread: (+ sessionId: string,+ numTurns: number,+ ) => Effect.Effect<ProviderThreadSnapshot, TError>;++ /**+ * Stop all sessions owned by this adapter.+ */+ readonly stopAll: () => Effect.Effect<void, TError>;++ /**+ * Subscribe to provider events emitted by this adapter.+ */+ readonly subscribeToEvents: (+ callback: (event: ProviderEvent) => void,+ ) => Effect.Effect<() => void, TError>;+}diff --git a/apps/server/src/provider/Services/ProviderAdapterRegistry.ts b/apps/server/src/provider/Services/ProviderAdapterRegistry.tsnew file mode 100644index 000000000..23066db79--- /dev/null+++ b/apps/server/src/provider/Services/ProviderAdapterRegistry.ts@@ -0,0 +1,37 @@+/**+ * ProviderAdapterRegistry - Lookup boundary for provider adapter implementations.+ *+ * Maps a provider kind to the concrete adapter service (Codex, Claude, etc).+ * It does not own session lifecycle or routing rules; `ProviderService` uses+ * this registry together with `ProviderSessionDirectory`.+ *+ * @module ProviderAdapterRegistry+ */+import type { ProviderKind } from "@t3tools/contracts";+import { ServiceMap } from "effect";+import type { Effect } from "effect";++import type { ProviderAdapterError, ProviderUnsupportedError } from "../Errors.ts";+import type { ProviderAdapterShape } from "./ProviderAdapter.ts";++export interface ProviderAdapterRegistryShape {+ /**+ * Resolve the adapter for a provider kind.+ */+ readonly getByProvider: (+ provider: ProviderKind,+ ) => Effect.Effect<ProviderAdapterShape<ProviderAdapterError>, ProviderUnsupportedError>;++ /**+ * List provider kinds currently registered.+ */+ readonly listProviders: () => Effect.Effect<ReadonlyArray<ProviderKind>>;+}++/**+ * ProviderAdapterRegistry - Service tag for provider adapter lookup.+ */+export class ProviderAdapterRegistry extends ServiceMap.Service<+ ProviderAdapterRegistry,+ ProviderAdapterRegistryShape+>()("provider/ProviderAdapterRegistry") {}diff --git a/apps/server/src/provider/Services/Provider.ts b/apps/server/src/provider/Services/ProviderService.tssimilarity index 84%rename from apps/server/src/provider/Services/Provider.tsrename to apps/server/src/provider/Services/ProviderService.tsindex 6ae8ee351..6d546bee6 100644--- a/apps/server/src/provider/Services/Provider.ts+++ b/apps/server/src/provider/Services/ProviderService.ts@@ -1,6 +1,11 @@/*** ProviderService - Service interface for provider sessions, turns, and checkpoints.*+ * Acts as the cross-provider facade used by transports (WebSocket/RPC). It+ * resolves provider adapters through `ProviderAdapterRegistry`, routes+ * session-scoped calls via `ProviderSessionDirectory`, and exposes one unified+ * provider event stream to callers.+ ** Uses Effect `ServiceMap.Service` for dependency injection and returns typed* domain errors for validation, session, codex, and checkpoint workflows.*@@ -59,7 +64,9 @@ export interface ProviderServiceShape {/*** Stop a provider session.*/- readonly stopSession: (input: ProviderStopSessionInput) => Effect.Effect<void, ProviderServiceError>;+ readonly stopSession: (+ input: ProviderStopSessionInput,+ ) => Effect.Effect<void, ProviderServiceError>;/*** List active provider sessions.@@ -92,13 +99,10 @@ export interface ProviderServiceShape {*/readonly stopAll: () => Effect.Effect<void, ProviderServiceError>;- /**- * Dispose provider resources (logs/listeners).- */- readonly dispose: () => Effect.Effect<void, ProviderServiceError>;-/*** Subscribe to provider event stream.+ *+ * Fan-out is owned by ProviderService (not by a standalone event-bus service).*/readonly subscribeToEvents: (callback: (event: ProviderEvent) => void,@@ -106,7 +110,7 @@ export interface ProviderServiceShape {}/**- * ProviderService - Context tag for provider orchestration.+ * ProviderService - Service tag for provider orchestration.*/export class ProviderService extends ServiceMap.Service<ProviderService, ProviderServiceShape>()("provider/ProviderService",diff --git a/apps/server/src/provider/Services/ProviderSessionDirectory.ts b/apps/server/src/provider/Services/ProviderSessionDirectory.tsnew file mode 100644index 000000000..70cb78b7c--- /dev/null+++ b/apps/server/src/provider/Services/ProviderSessionDirectory.ts@@ -0,0 +1,61 @@+/**+ * ProviderSessionDirectory - Session ownership index across provider adapters.+ *+ * Tracks which provider owns each `sessionId` so `ProviderService` can route+ * session-scoped calls to the correct adapter. It is metadata only and does not+ * perform provider RPC or checkpoint operations.+ *+ * @module ProviderSessionDirectory+ */+import type { ProviderKind } from "@t3tools/contracts";+import { Option, ServiceMap } from "effect";+import type { Effect } from "effect";++import type { ProviderSessionNotFoundError, ProviderValidationError } from "../Errors.ts";++export interface ProviderSessionBinding {+ readonly sessionId: string;+ readonly provider: ProviderKind;+ readonly threadId?: string;+}++export interface ProviderSessionDirectoryShape {+ /**+ * Record or update ownership for one provider session.+ */+ readonly upsert: (+ binding: ProviderSessionBinding,+ ) => Effect.Effect<void, ProviderValidationError>;++ /**+ * Resolve the provider owner for a session id.+ */+ readonly getProvider: (+ sessionId: string,+ ) => Effect.Effect<ProviderKind, ProviderSessionNotFoundError>;++ /**+ * Resolve the tracked thread id for a session, if known.+ */+ readonly getThreadId: (+ sessionId: string,+ ) => Effect.Effect<Option.Option<string>, ProviderSessionNotFoundError>;++ /**+ * Remove a session binding.+ */+ readonly remove: (sessionId: string) => Effect.Effect<void>;++ /**+ * List tracked session ids.+ */+ readonly listSessionIds: () => Effect.Effect<ReadonlyArray<string>>;+}++/**+ * ProviderSessionDirectory - Service tag for session ownership lookup.+ */+export class ProviderSessionDirectory extends ServiceMap.Service<+ ProviderSessionDirectory,+ ProviderSessionDirectoryShape+>()("provider/ProviderSessionDirectory") {}diff --git a/apps/server/src/provider/contracts.test.ts b/apps/server/src/provider/contracts.test.tsindex 3675af73e..73756e09c 100644--- a/apps/server/src/provider/contracts.test.ts+++ b/apps/server/src/provider/contracts.test.ts@@ -1,22 +1,31 @@import { describe, expect, it } from "vitest";-import { Effect, Layer, ManagedRuntime } from "effect";+import { Effect, Layer, ManagedRuntime, Option } from "effect";import {- CheckpointValidationError,- CodexValidationError,+ ProviderAdapterValidationError,ProviderFilesystemError,+ ProviderSessionNotFoundError,ProviderUnsupportedError,- type CheckpointStoreError,- type CodexServiceError,+ type ProviderAdapterError,type ProviderServiceError,} from "./Errors.ts";-import { CheckpointStore } from "./Services/CheckpointStore.ts";-import { CodexService } from "./Services/Codex.ts";-import { ProviderService } from "./Services/Provider.ts";+import {+ CheckpointValidationError,+ type CheckpointCatalogError,+ type CheckpointServiceError,+ type CheckpointStoreError,+} from "../checkpointing/Errors.ts";+import { CheckpointCatalog } from "../checkpointing/Services/CheckpointCatalog.ts";+import { CheckpointService } from "../checkpointing/Services/CheckpointService.ts";+import { CheckpointStore } from "../checkpointing/Services/CheckpointStore.ts";+import { CodexAdapter } from "./Services/CodexAdapter.ts";+import { ProviderAdapterRegistry } from "./Services/ProviderAdapterRegistry.ts";+import { ProviderService } from "./Services/ProviderService.ts";+import { ProviderSessionDirectory } from "./Services/ProviderSessionDirectory.ts";-describe("provider service contracts", () => {- it("resolves provider, codex, and checkpoint services from ServiceMap tags", async () => {+describe("provider/checkpoint service contracts", () => {+ it("resolves all service tags from ServiceMap", async () => {const providerLive: typeof ProviderService.Service = {startSession: () =>Effect.fail<ProviderServiceError>(new ProviderUnsupportedError({ provider: "x" })),@@ -35,34 +44,58 @@ describe("provider service contracts", () => {revertToCheckpoint: () =>Effect.fail<ProviderServiceError>(new ProviderUnsupportedError({ provider: "x" })),stopAll: () => Effect.void,- dispose: () => Effect.void,subscribeToEvents: () => Effect.succeed(() => undefined),};- const codexLive: typeof CodexService.Service = {+ const codexLive: typeof CodexAdapter.Service = {+ provider: "codex",startSession: () =>- Effect.fail<CodexServiceError>(- new CodexValidationError({ operation: "startSession", issue: "not implemented" }),+ Effect.fail<ProviderAdapterError>(+ new ProviderAdapterValidationError({+ provider: "codex",+ operation: "startSession",+ issue: "not implemented",+ }),),sendTurn: () =>- Effect.fail<CodexServiceError>(- new CodexValidationError({ operation: "sendTurn", issue: "not implemented" }),+ Effect.fail<ProviderAdapterError>(+ new ProviderAdapterValidationError({+ provider: "codex",+ operation: "sendTurn",+ issue: "not implemented",+ }),),interruptTurn: () =>- Effect.fail<CodexServiceError>(- new CodexValidationError({ operation: "interruptTurn", issue: "not implemented" }),+ Effect.fail<ProviderAdapterError>(+ new ProviderAdapterValidationError({+ provider: "codex",+ operation: "interruptTurn",+ issue: "not implemented",+ }),),readThread: () =>- Effect.fail<CodexServiceError>(- new CodexValidationError({ operation: "readThread", issue: "not implemented" }),+ Effect.fail<ProviderAdapterError>(+ new ProviderAdapterValidationError({+ provider: "codex",+ operation: "readThread",+ issue: "not implemented",+ }),),rollbackThread: () =>- Effect.fail<CodexServiceError>(- new CodexValidationError({ operation: "rollbackThread", issue: "not implemented" }),+ Effect.fail<ProviderAdapterError>(+ new ProviderAdapterValidationError({+ provider: "codex",+ operation: "rollbackThread",+ issue: "not implemented",+ }),),respondToRequest: () =>- Effect.fail<CodexServiceError>(- new CodexValidationError({ operation: "respondToRequest", issue: "not implemented" }),+ Effect.fail<ProviderAdapterError>(+ new ProviderAdapterValidationError({+ provider: "codex",+ operation: "respondToRequest",+ issue: "not implemented",+ }),),stopSession: () => Effect.void,listSessions: () => Effect.succeed([]),@@ -71,7 +104,7 @@ describe("provider service contracts", () => {subscribeToEvents: () => Effect.succeed(() => undefined),};- const checkpointLive: typeof CheckpointStore.Service = {+ const checkpointStoreLive: typeof CheckpointStore.Service = {isGitRepository: () => Effect.succeed(false),captureCheckpoint: () => Effect.void,hasCheckpoint: () => Effect.succeed(false),@@ -87,39 +120,117 @@ describe("provider service contracts", () => {pruneAfterTurn: () => Effect.void,};+ const checkpointCatalogLive: typeof CheckpointCatalog.Service = {+ upsertCheckpoint: () => Effect.void,+ listCheckpoints: () => Effect.succeed([]),+ getCheckpoint: () => Effect.succeed(Option.none()),+ deleteAfterTurn: () => Effect.void,+ deleteAllForSession: () => Effect.void,+ };++ const checkpointServiceLive: typeof CheckpointService.Service = {+ initializeForSession: () => Effect.void,+ captureCurrentTurn: () => Effect.void,+ listCheckpoints: () =>+ Effect.fail<CheckpointServiceError>(+ new CheckpointValidationError({ operation: "listCheckpoints", issue: "not implemented" }),+ ),+ getCheckpointDiff: () =>+ Effect.fail<CheckpointServiceError>(+ new CheckpointValidationError({+ operation: "getCheckpointDiff",+ issue: "not implemented",+ }),+ ),+ revertToCheckpoint: () =>+ Effect.fail<CheckpointServiceError>(+ new CheckpointValidationError({+ operation: "revertToCheckpoint",+ issue: "not implemented",+ }),+ ),+ };++ const providerAdapterRegistryLive: typeof ProviderAdapterRegistry.Service = {+ getByProvider: (provider) =>+ provider === "codex"+ ? Effect.succeed(codexLive)+ : Effect.fail<ProviderUnsupportedError>(new ProviderUnsupportedError({ provider })),+ listProviders: () => Effect.succeed(["codex"]),+ };++ const providerSessionDirectoryLive: typeof ProviderSessionDirectory.Service = {+ upsert: () => Effect.void,+ getProvider: (sessionId) =>+ Effect.fail<ProviderSessionNotFoundError>(new ProviderSessionNotFoundError({ sessionId })),+ getThreadId: (sessionId) =>+ Effect.fail<ProviderSessionNotFoundError>(new ProviderSessionNotFoundError({ sessionId })),+ remove: () => Effect.void,+ listSessionIds: () => Effect.succeed([]),+ };+const runtime = ManagedRuntime.make(Layer.mergeAll(Layer.succeed(ProviderService, providerLive),- Layer.succeed(CodexService, codexLive),- Layer.succeed(CheckpointStore, checkpointLive),+ Layer.succeed(CodexAdapter, codexLive),+ Layer.succeed(CheckpointStore, checkpointStoreLive),+ Layer.succeed(CheckpointCatalog, checkpointCatalogLive),+ Layer.succeed(CheckpointService, checkpointServiceLive),+ Layer.succeed(ProviderAdapterRegistry, providerAdapterRegistryLive),+ Layer.succeed(ProviderSessionDirectory, providerSessionDirectoryLive),),);- const [provider, codex, checkpoint] = await Promise.all([+ const [+ provider,+ codex,+ checkpointStore,+ checkpointCatalog,+ checkpointService,+ providerAdapterRegistry,+ providerSessionDirectory,+ ] = await Promise.all([runtime.runPromise(Effect.service(ProviderService)),- runtime.runPromise(Effect.service(CodexService)),+ runtime.runPromise(Effect.service(CodexAdapter)),runtime.runPromise(Effect.service(CheckpointStore)),+ runtime.runPromise(Effect.service(CheckpointCatalog)),+ runtime.runPromise(Effect.service(CheckpointService)),+ runtime.runPromise(Effect.service(ProviderAdapterRegistry)),+ runtime.runPromise(Effect.service(ProviderSessionDirectory)),]);expect(provider).toBe(providerLive);expect(codex).toBe(codexLive);- expect(checkpoint).toBe(checkpointLive);+ expect(checkpointStore).toBe(checkpointStoreLive);+ expect(checkpointCatalog).toBe(checkpointCatalogLive);+ expect(checkpointService).toBe(checkpointServiceLive);+ expect(providerAdapterRegistry).toBe(providerAdapterRegistryLive);+ expect(providerSessionDirectory).toBe(providerSessionDirectoryLive);await runtime.dispose();});});-describe("provider error taxonomy", () => {- it("keeps defect cause and message on tagged errors", () => {- const cause = new Error("filesystem failed");- const error = new ProviderFilesystemError({+describe("provider/checkpoint errors", () => {+ it("preserves cause and message on tagged errors", () => {+ const fsCause = new Error("filesystem failed");+ const fsError = new ProviderFilesystemError({sessionId: "sess-1",detail: "capture failed",- cause,+ cause: fsCause,+ });++ expect(fsError._tag).toBe("ProviderFilesystemError");+ expect(fsError.message).toContain("sess-1");+ expect(fsError.cause).toBe(fsCause);+ });++ it("accepts checkpoint catalog error channel type", () => {+ const error: CheckpointCatalogError = new CheckpointValidationError({+ operation: "upsertCheckpoint",+ issue: "turnCount must be >= 0",});- expect(error._tag).toBe("ProviderFilesystemError");- expect(error.message).toContain("sess-1");- expect(error.cause).toBe(cause);+ expect(error._tag).toBe("CheckpointValidationError");});});