Commit 742dd7af0dcb54c32774f87fd354105726c7a9db | the-knife

apps/server/src/provider/Layers/CodexProvider.ts+3-2

...	@@ -7,7 +7,8 @@ import * as Result from "effect/Result";	...	@@ -7,7 +7,8 @@ import * as Result from "effect/Result";
7	import * as Schema from "effect/Schema";	7	import * as Schema from "effect/Schema";
8	import * as Scope from "effect/Scope";	8	import * as Scope from "effect/Scope";
9	import * as Types from "effect/Types";	9	import * as Types from "effect/Types";
10	import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";	10	import * as ChildProcess from "effect/unstable/process/ChildProcess";
		11	import * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner";
11	import * as CodexClient from "effect-codex-app-server/client";	12	import * as CodexClient from "effect-codex-app-server/client";
12	import * as CodexSchema from "effect-codex-app-server/schema";	13	import * as CodexSchema from "effect-codex-app-server/schema";
13	import * as CodexErrors from "effect-codex-app-server/errors";	14	import * as CodexErrors from "effect-codex-app-server/errors";
...	@@ -253,7 +254,7 @@ function parseCodexSkillsListResponse(	...	@@ -253,7 +254,7 @@ function parseCodexSkillsListResponse(
253	}	254	}
254		255
255	const requestAllCodexModels = Effect.fn("requestAllCodexModels")(function* (	256	const requestAllCodexModels = Effect.fn("requestAllCodexModels")(function* (
256	client: CodexClient.CodexAppServerClientShape,	257	client: CodexClient.CodexAppServerClient["Service"],
257	) {	258	) {
258	const models: ServerProviderModel[] = [];	259	const models: ServerProviderModel[] = [];
259	let cursor: string \| null \| undefined = undefined;	260	let cursor: string \| null \| undefined = undefined;

apps/server/src/provider/Layers/CursorAdapter.ts+4-4

...	@@ -36,7 +36,7 @@ import * as Scope from "effect/Scope";	...	@@ -36,7 +36,7 @@ import * as Scope from "effect/Scope";
36	import * as Semaphore from "effect/Semaphore";	36	import * as Semaphore from "effect/Semaphore";
37	import * as Stream from "effect/Stream";	37	import * as Stream from "effect/Stream";
38	import * as SynchronizedRef from "effect/SynchronizedRef";	38	import * as SynchronizedRef from "effect/SynchronizedRef";
39	import { ChildProcessSpawner } from "effect/unstable/process";	39	import * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner";
40	import * as EffectAcpErrors from "effect-acp/errors";	40	import * as EffectAcpErrors from "effect-acp/errors";
41	import type * as EffectAcpSchema from "effect-acp/schema";	41	import type * as EffectAcpSchema from "effect-acp/schema";
42		42
...	@@ -50,7 +50,7 @@ import {	...	@@ -50,7 +50,7 @@ import {
50	ProviderAdapterValidationError,	50	ProviderAdapterValidationError,
51	} from "../Errors.ts";	51	} from "../Errors.ts";
52	import { acpPermissionOutcome, mapAcpToAdapterError } from "../acp/AcpAdapterSupport.ts";	52	import { acpPermissionOutcome, mapAcpToAdapterError } from "../acp/AcpAdapterSupport.ts";
53	import { type AcpSessionRuntimeShape } from "../acp/AcpSessionRuntime.ts";	53	import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
54	import {	54	import {
55	makeAcpAssistantItemEvent,	55	makeAcpAssistantItemEvent,
56	makeAcpContentDeltaEvent,	56	makeAcpContentDeltaEvent,
...	@@ -126,7 +126,7 @@ interface CursorSessionContext {	...	@@ -126,7 +126,7 @@ interface CursorSessionContext {
126	readonly threadId: ThreadId;	126	readonly threadId: ThreadId;
127	session: ProviderSession;	127	session: ProviderSession;
128	readonly scope: Scope.Closeable;	128	readonly scope: Scope.Closeable;
129	readonly acp: AcpSessionRuntimeShape;	129	readonly acp: AcpSessionRuntime.AcpSessionRuntime["Service"];
130	notificationFiber: Fiber.Fiber<void, never> \| undefined;	130	notificationFiber: Fiber.Fiber<void, never> \| undefined;
131	readonly pendingApprovals: Map<ApprovalRequestId, PendingApproval>;	131	readonly pendingApprovals: Map<ApprovalRequestId, PendingApproval>;
132	readonly pendingUserInputs: Map<ApprovalRequestId, PendingUserInput>;	132	readonly pendingUserInputs: Map<ApprovalRequestId, PendingUserInput>;
...	@@ -246,7 +246,7 @@ function resolveRequestedModeId(input: {	...	@@ -246,7 +246,7 @@ function resolveRequestedModeId(input: {
246	}	246	}
247		247
248	function applyRequestedSessionConfiguration<E>(input: {	248	function applyRequestedSessionConfiguration<E>(input: {
249	readonly runtime: AcpSessionRuntimeShape;	249	readonly runtime: AcpSessionRuntime.AcpSessionRuntime["Service"];
250	readonly runtimeMode: RuntimeMode;	250	readonly runtimeMode: RuntimeMode;
251	readonly interactionMode: ProviderInteractionMode \| undefined;	251	readonly interactionMode: ProviderInteractionMode \| undefined;
252	readonly modelSelection:	252	readonly modelSelection:

apps/server/src/provider/Layers/CursorProvider.ts+7-4

 @@ -21,7 +21,8 @@ import * as Path from "effect/Path";
 import * as Result from "effect/Result";
 import * as Schema from "effect/Schema";
 import { HttpClient } from "effect/unstable/http";
-import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
+import * as ChildProcess from "effect/unstable/process/ChildProcess";
+import * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner";
 import {
   createModelCapabilities,
   getProviderOptionBooleanSelectionValue,
 @@ -43,7 +44,7 @@ import {
   enrichProviderSnapshotWithVersionAdvisory,
   type ProviderMaintenanceCapabilities,
 } from "../providerMaintenance.ts";
-import { AcpSessionRuntime } from "../acp/AcpSessionRuntime.ts";
+import * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
 import { CursorListAvailableModelsResponse } from "../acp/CursorAcpExtension.ts";
 const decodeCursorListAvailableModelsResponse = Schema.decodeUnknownEffect(
 @@ -416,12 +417,14 @@ const makeCursorAcpProbeRuntime = (
         clientCapabilities: CURSOR_PARAMETERIZED_MODEL_PICKER_CAPABILITIES,
       }).pipe(Layer.provide(Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, spawner))),
     );
-    return yield* Effect.service(AcpSessionRuntime).pipe(Effect.provide(acpContext));
+    return yield* Effect.service(AcpSessionRuntime.AcpSessionRuntime).pipe(
+      Effect.provide(acpContext),
+    );
   });
 const withCursorAcpProbeRuntime = <A, E, R>(
   cursorSettings: CursorSettings,
-  useRuntime: (acp: AcpSessionRuntime["Service"]) => Effect.Effect<A, E, R>,
+  useRuntime: (acp: AcpSessionRuntime.AcpSessionRuntime["Service"]) => Effect.Effect<A, E, R>,
   environment?: NodeJS.ProcessEnv,
 ) =>
   makeCursorAcpProbeRuntime(cursorSettings, environment).pipe(

apps/server/src/provider/Layers/GrokAdapter.ts+3-3

apps/server/src/provider/acp/AcpJsonRpcConnection.test.ts+12-12

apps/server/src/provider/acp/AcpNativeLogging.ts+5-5

...	@@ -6,9 +6,9 @@ import * as Effect from "effect/Effect";	...	@@ -6,9 +6,9 @@ import * as Effect from "effect/Effect";
6	import type * as EffectAcpProtocol from "effect-acp/protocol";	6	import type * as EffectAcpProtocol from "effect-acp/protocol";
7		7
8	import type { EventNdjsonLogger } from "../Layers/EventNdjsonLogger.ts";	8	import type { EventNdjsonLogger } from "../Layers/EventNdjsonLogger.ts";
9	import type { AcpSessionRequestLogEvent, AcpSessionRuntimeOptions } from "./AcpSessionRuntime.ts";	9	import type * as AcpSessionRuntime from "./AcpSessionRuntime.ts";
10		10
11	function formatRequestLogPayload(event: AcpSessionRequestLogEvent) {	11	function formatRequestLogPayload(event: AcpSessionRuntime.AcpSessionRequestLogEvent) {
12	return {	12	return {
13	method: event.method,	13	method: event.method,
14	status: event.status,	14	status: event.status,
...	@@ -24,7 +24,7 @@ export const makeAcpNativeLoggerFactory = Effect.fn("makeAcpNativeLoggerFactory"	...	@@ -24,7 +24,7 @@ export const makeAcpNativeLoggerFactory = Effect.fn("makeAcpNativeLoggerFactory"
24	readonly nativeEventLogger: EventNdjsonLogger \| undefined;	24	readonly nativeEventLogger: EventNdjsonLogger \| undefined;
25	readonly provider: ProviderDriverKind;	25	readonly provider: ProviderDriverKind;
26	readonly threadId: ThreadId;	26	readonly threadId: ThreadId;
27	}): Pick<AcpSessionRuntimeOptions, "requestLogger" \| "protocolLogging"> => {	27	}): Pick<AcpSessionRuntime.AcpSessionRuntimeOptions, "requestLogger" \| "protocolLogging"> => {
28	const writeNativeAcpLog = (logInput: {	28	const writeNativeAcpLog = (logInput: {
29	readonly kind: "request" \| "protocol";	29	readonly kind: "request" \| "protocol";
30	readonly payload: unknown;	30	readonly payload: unknown;
...	@@ -57,7 +57,7 @@ export const makeAcpNativeLoggerFactory = Effect.fn("makeAcpNativeLoggerFactory"	...	@@ -57,7 +57,7 @@ export const makeAcpNativeLoggerFactory = Effect.fn("makeAcpNativeLoggerFactory"
57	);	57	);
58		58
59	return {	59	return {
60	requestLogger: (event: AcpSessionRequestLogEvent) =>	60	requestLogger: (event: AcpSessionRuntime.AcpSessionRequestLogEvent) =>
61	writeNativeAcpLog({	61	writeNativeAcpLog({
62	kind: "request",	62	kind: "request",
63	payload: formatRequestLogPayload(event),	63	payload: formatRequestLogPayload(event),
...	@@ -72,7 +72,7 @@ export const makeAcpNativeLoggerFactory = Effect.fn("makeAcpNativeLoggerFactory"	...	@@ -72,7 +72,7 @@ export const makeAcpNativeLoggerFactory = Effect.fn("makeAcpNativeLoggerFactory"
72	kind: "protocol",	72	kind: "protocol",
73	payload: event,	73	payload: event,
74	}),	74	}),
75	} satisfies NonNullable<AcpSessionRuntimeOptions["protocolLogging"]>,	75	} satisfies NonNullable<AcpSessionRuntime.AcpSessionRuntimeOptions["protocolLogging"]>,
76	}	76	}
77	: {}),	77	: {}),
78	};	78	};

apps/server/src/provider/acp/AcpSessionRuntime.ts+161-63

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	import * as Cause from "effect/Cause";	1	import * as Cause from "effect/Cause";
		2	import * as Context from "effect/Context";
2	import * as Deferred from "effect/Deferred";	3	import * as Deferred from "effect/Deferred";
3	import * as Effect from "effect/Effect";	4	import * as Effect from "effect/Effect";
4	import * as Exit from "effect/Exit";	5	import * as Exit from "effect/Exit";
...	@@ -6,9 +7,9 @@ import * as Layer from "effect/Layer";	...	@@ -6,9 +7,9 @@ import * as Layer from "effect/Layer";
6	import * as Queue from "effect/Queue";	7	import * as Queue from "effect/Queue";
7	import * as Ref from "effect/Ref";	8	import * as Ref from "effect/Ref";
8	import * as Scope from "effect/Scope";	9	import * as Scope from "effect/Scope";
9	import * as Context from "effect/Context";
10	import * as Stream from "effect/Stream";	10	import * as Stream from "effect/Stream";
11	import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";	11	import * as ChildProcess from "effect/unstable/process/ChildProcess";
		12	import * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner";
12	import * as EffectAcpClient from "effect-acp/client";	13	import * as EffectAcpClient from "effect-acp/client";
13	import * as EffectAcpErrors from "effect-acp/errors";	14	import * as EffectAcpErrors from "effect-acp/errors";
14	import type * as EffectAcpSchema from "effect-acp/schema";	15	import type * as EffectAcpSchema from "effect-acp/schema";
...	@@ -75,50 +76,153 @@ export interface AcpSessionRuntimeStartResult {	...	@@ -75,50 +76,153 @@ export interface AcpSessionRuntimeStartResult {
75	readonly modelConfigId: string \| undefined;	76	readonly modelConfigId: string \| undefined;
76	}	77	}
77		78
78	export interface AcpSessionRuntimeShape {	79	export class AcpSessionRuntime extends Context.Service<
79	readonly handleRequestPermission: EffectAcpClient.AcpClientShape["handleRequestPermission"];	80	AcpSessionRuntime,
80	readonly handleElicitation: EffectAcpClient.AcpClientShape["handleElicitation"];	81	{
81	readonly handleReadTextFile: EffectAcpClient.AcpClientShape["handleReadTextFile"];	82	/**
82	readonly handleWriteTextFile: EffectAcpClient.AcpClientShape["handleWriteTextFile"];	83	* Registers a handler for `session/request_permission`.
83	readonly handleCreateTerminal: EffectAcpClient.AcpClientShape["handleCreateTerminal"];	84	* @see https://agentclientprotocol.com/protocol/schema#session/request_permission
84	readonly handleTerminalOutput: EffectAcpClient.AcpClientShape["handleTerminalOutput"];	85	*/
85	readonly handleTerminalWaitForExit: EffectAcpClient.AcpClientShape["handleTerminalWaitForExit"];	86	readonly handleRequestPermission: EffectAcpClient.AcpClient["Service"]["handleRequestPermission"];
86	readonly handleTerminalKill: EffectAcpClient.AcpClientShape["handleTerminalKill"];	87	/**
87	readonly handleTerminalRelease: EffectAcpClient.AcpClientShape["handleTerminalRelease"];	88	* Registers a handler for `session/elicitation`.
88	readonly handleSessionUpdate: EffectAcpClient.AcpClientShape["handleSessionUpdate"];	89	* @see https://agentclientprotocol.com/protocol/schema#session/elicitation
89	readonly handleElicitationComplete: EffectAcpClient.AcpClientShape["handleElicitationComplete"];	90	*/
90	readonly handleUnknownExtRequest: EffectAcpClient.AcpClientShape["handleUnknownExtRequest"];	91	readonly handleElicitation: EffectAcpClient.AcpClient["Service"]["handleElicitation"];
91	readonly handleUnknownExtNotification: EffectAcpClient.AcpClientShape["handleUnknownExtNotification"];	92	/**
92	readonly handleExtRequest: EffectAcpClient.AcpClientShape["handleExtRequest"];	93	* Registers a handler for `fs/read_text_file`.
93	readonly handleExtNotification: EffectAcpClient.AcpClientShape["handleExtNotification"];	94	* @see https://agentclientprotocol.com/protocol/schema#fs/read_text_file
94	readonly start: () => Effect.Effect<AcpSessionRuntimeStartResult, EffectAcpErrors.AcpError>;	95	*/
95	readonly getEvents: () => Stream.Stream<AcpParsedSessionEvent, never>;	96	readonly handleReadTextFile: EffectAcpClient.AcpClient["Service"]["handleReadTextFile"];
96	readonly getModeState: Effect.Effect<AcpSessionModeState \| undefined>;	97	/**
97	readonly getConfigOptions: Effect.Effect<ReadonlyArray<EffectAcpSchema.SessionConfigOption>>;	98	* Registers a handler for `fs/write_text_file`.
98	readonly prompt: (	99	* @see https://agentclientprotocol.com/protocol/schema#fs/write_text_file
99	payload: Omit<EffectAcpSchema.PromptRequest, "sessionId">,	100	*/
100	) => Effect.Effect<EffectAcpSchema.PromptResponse, EffectAcpErrors.AcpError>;	101	readonly handleWriteTextFile: EffectAcpClient.AcpClient["Service"]["handleWriteTextFile"];
101	readonly cancel: Effect.Effect<void, EffectAcpErrors.AcpError>;	102	/**
102	readonly setMode: (	103	* Registers a handler for `terminal/create`.
103	modeId: string,	104	* @see https://agentclientprotocol.com/protocol/schema#terminal/create
104	) => Effect.Effect<EffectAcpSchema.SetSessionModeResponse, EffectAcpErrors.AcpError>;	105	*/
105	readonly setConfigOption: (	106	readonly handleCreateTerminal: EffectAcpClient.AcpClient["Service"]["handleCreateTerminal"];
106	configId: string,	107	/**
107	value: string \| boolean,	108	* Registers a handler for `terminal/output`.
108	) => Effect.Effect<EffectAcpSchema.SetSessionConfigOptionResponse, EffectAcpErrors.AcpError>;	109	* @see https://agentclientprotocol.com/protocol/schema#terminal/output
109	readonly setModel: (model: string) => Effect.Effect<void, EffectAcpErrors.AcpError>;	110	*/
110	readonly setSessionModel: (	111	readonly handleTerminalOutput: EffectAcpClient.AcpClient["Service"]["handleTerminalOutput"];
111	modelId: string,	112	/**
112	) => Effect.Effect<EffectAcpSchema.SetSessionModelResponse, EffectAcpErrors.AcpError>;	113	* Registers a handler for `terminal/wait_for_exit`.
113	readonly request: (	114	* @see https://agentclientprotocol.com/protocol/schema#terminal/wait_for_exit
114	method: string,	115	*/
115	payload: unknown,	116	readonly handleTerminalWaitForExit: EffectAcpClient.AcpClient["Service"]["handleTerminalWaitForExit"];
116	) => Effect.Effect<unknown, EffectAcpErrors.AcpError>;	117	/**
117	readonly notify: (	118	* Registers a handler for `terminal/kill`.
118	method: string,	119	* @see https://agentclientprotocol.com/protocol/schema#terminal/kill
119	payload: unknown,	120	*/
120	) => Effect.Effect<void, EffectAcpErrors.AcpError>;	121	readonly handleTerminalKill: EffectAcpClient.AcpClient["Service"]["handleTerminalKill"];
121	}	122	/**
		123	* Registers a handler for `terminal/release`.
		124	* @see https://agentclientprotocol.com/protocol/schema#terminal/release
		125	*/
		126	readonly handleTerminalRelease: EffectAcpClient.AcpClient["Service"]["handleTerminalRelease"];
		127	/**
		128	* Registers a handler for `session/update`.
		129	* @see https://agentclientprotocol.com/protocol/schema#session/update
		130	*/
		131	readonly handleSessionUpdate: EffectAcpClient.AcpClient["Service"]["handleSessionUpdate"];
		132	/**
		133	* Registers a handler for `session/elicitation/complete`.
		134	* @see https://agentclientprotocol.com/protocol/schema#session/elicitation/complete
		135	*/
		136	readonly handleElicitationComplete: EffectAcpClient.AcpClient["Service"]["handleElicitationComplete"];
		137	/**
		138	* Registers a fallback extension request handler.
		139	* @see https://agentclientprotocol.com/protocol/extensibility
		140	*/
		141	readonly handleUnknownExtRequest: EffectAcpClient.AcpClient["Service"]["handleUnknownExtRequest"];
		142	/**
		143	* Registers a fallback extension notification handler.
		144	* @see https://agentclientprotocol.com/protocol/extensibility
		145	*/
		146	readonly handleUnknownExtNotification: EffectAcpClient.AcpClient["Service"]["handleUnknownExtNotification"];
		147	/**
		148	* Registers a typed extension request handler.
		149	* @see https://agentclientprotocol.com/protocol/extensibility
		150	*/
		151	readonly handleExtRequest: EffectAcpClient.AcpClient["Service"]["handleExtRequest"];
		152	/**
		153	* Registers a typed extension notification handler.
		154	* @see https://agentclientprotocol.com/protocol/extensibility
		155	*/
		156	readonly handleExtNotification: EffectAcpClient.AcpClient["Service"]["handleExtNotification"];
		157	/**
		158	* Initializes the ACP connection, authenticates, and loads, resumes, or creates the session.
		159	* Concurrent calls share the same in-flight startup and a failed startup may be retried.
		160	*/
		161	readonly start: () => Effect.Effect<AcpSessionRuntimeStartResult, EffectAcpErrors.AcpError>;
		162	/** Stream of parsed ACP session events emitted after startup. */
		163	readonly getEvents: () => Stream.Stream<AcpParsedSessionEvent, never>;
		164	/** Latest mode state observed from session setup and `session/update` notifications. */
		165	readonly getModeState: Effect.Effect<AcpSessionModeState \| undefined>;
		166	/** Latest configuration options observed from session setup and configuration writes. */
		167	readonly getConfigOptions: Effect.Effect<ReadonlyArray<EffectAcpSchema.SessionConfigOption>>;
		168	/**
		169	* Sends a prompt turn to the active session.
		170	* @see https://agentclientprotocol.com/protocol/schema#session/prompt
		171	*/
		172	readonly prompt: (
		173	payload: Omit<EffectAcpSchema.PromptRequest, "sessionId">,
		174	) => Effect.Effect<EffectAcpSchema.PromptResponse, EffectAcpErrors.AcpError>;
		175	/**
		176	* Sends a real ACP `session/cancel` notification for the active session.
		177	* @see https://agentclientprotocol.com/protocol/schema#session/cancel
		178	*/
		179	readonly cancel: Effect.Effect<void, EffectAcpErrors.AcpError>;
		180	/**
		181	* Selects the active mode through the negotiated `mode` configuration option.
		182	* This is a no-op when the requested mode is already active.
		183	* @see https://agentclientprotocol.com/protocol/schema#session/set_config_option
		184	*/
		185	readonly setMode: (
		186	modeId: string,
		187	) => Effect.Effect<EffectAcpSchema.SetSessionModeResponse, EffectAcpErrors.AcpError>;
		188	/**
		189	* Updates a session configuration option and the runtime configuration snapshot.
		190	* @see https://agentclientprotocol.com/protocol/schema#session/set_config_option
		191	*/
		192	readonly setConfigOption: (
		193	configId: string,
		194	value: string \| boolean,
		195	) => Effect.Effect<EffectAcpSchema.SetSessionConfigOptionResponse, EffectAcpErrors.AcpError>;
		196	/**
		197	* Selects the base model through the negotiated model configuration option.
		198	* @see https://agentclientprotocol.com/protocol/schema#session/set_config_option
		199	*/
		200	readonly setModel: (model: string) => Effect.Effect<void, EffectAcpErrors.AcpError>;
		201	/**
		202	* Selects the active model through the unstable ACP `session/set_model` capability.
		203	* @see https://agentclientprotocol.com/protocol/schema#session/set_model
		204	*/
		205	readonly setSessionModel: (
		206	modelId: string,
		207	) => Effect.Effect<EffectAcpSchema.SetSessionModelResponse, EffectAcpErrors.AcpError>;
		208	/**
		209	* Sends a generic ACP extension request and records it through the request logger.
		210	* @see https://agentclientprotocol.com/protocol/extensibility
		211	*/
		212	readonly request: (
		213	method: string,
		214	payload: unknown,
		215	) => Effect.Effect<unknown, EffectAcpErrors.AcpError>;
		216	/**
		217	* Sends a generic ACP extension notification.
		218	* @see https://agentclientprotocol.com/protocol/extensibility
		219	*/
		220	readonly notify: (
		221	method: string,
		222	payload: unknown,
		223	) => Effect.Effect<void, EffectAcpErrors.AcpError>;
		224	}
		225	>()("t3/provider/acp/AcpSessionRuntime") {}
122		226
123	interface AcpStartedState extends AcpSessionRuntimeStartResult {}	227	interface AcpStartedState extends AcpSessionRuntimeStartResult {}
124		228
...	@@ -140,24 +244,10 @@ interface EnsureActiveAssistantSegmentResult {	...	@@ -140,24 +244,10 @@ interface EnsureActiveAssistantSegmentResult {
140	readonly startedEvent?: Extract<AcpParsedSessionEvent, { readonly _tag: "AssistantItemStarted" }>;	244	readonly startedEvent?: Extract<AcpParsedSessionEvent, { readonly _tag: "AssistantItemStarted" }>;
141	}	245	}
142		246
143	export class AcpSessionRuntime extends Context.Service<AcpSessionRuntime, AcpSessionRuntimeShape>()(	247	export const make = (
144	"t3/provider/acp/AcpSessionRuntime",
145	) {
146	static layer(
147	options: AcpSessionRuntimeOptions,
148	): Layer.Layer<
149	AcpSessionRuntime,
150	EffectAcpErrors.AcpError,
151	ChildProcessSpawner.ChildProcessSpawner
152	> {
153	return Layer.effect(AcpSessionRuntime, makeAcpSessionRuntime(options));
154	}
155	}
156
157	const makeAcpSessionRuntime = (
158	options: AcpSessionRuntimeOptions,	248	options: AcpSessionRuntimeOptions,
159	): Effect.Effect<	249	): Effect.Effect<
160	AcpSessionRuntimeShape,	250	AcpSessionRuntime["Service"],
161	EffectAcpErrors.AcpError,	251	EffectAcpErrors.AcpError,
162	ChildProcessSpawner.ChildProcessSpawner \| Scope.Scope	252	ChildProcessSpawner.ChildProcessSpawner \| Scope.Scope
163	> =>	253	> =>
...	@@ -573,9 +663,17 @@ const makeAcpSessionRuntime = (	...	@@ -573,9 +663,17 @@ const makeAcpSessionRuntime = (
573	request: (method, payload) =>	663	request: (method, payload) =>
574	runLoggedRequest(method, payload, acp.raw.request(method, payload)),	664	runLoggedRequest(method, payload, acp.raw.request(method, payload)),
575	notify: acp.raw.notify,	665	notify: acp.raw.notify,
576	} satisfies AcpSessionRuntimeShape;	666	} satisfies AcpSessionRuntime["Service"];
577	});	667	});
578		668
		669	export const layer = (
		670	options: AcpSessionRuntimeOptions,
		671	): Layer.Layer<
		672	AcpSessionRuntime,
		673	EffectAcpErrors.AcpError,
		674	ChildProcessSpawner.ChildProcessSpawner
		675	> => Layer.effect(AcpSessionRuntime, make(options));
		676
579	function sessionConfigOptionsFromSetup(	677	function sessionConfigOptionsFromSetup(
580	response:	678	response:
581	\| {	679	\| {

apps/server/src/provider/acp/CursorAcpCliProbe.test.ts+4-4

apps/server/src/provider/acp/CursorAcpSupport.ts+13-12

 @@ -2,7 +2,7 @@ import { type CursorSettings, type ProviderOptionSelection } from "@t3tools/cont
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Scope from "effect/Scope";
-import { ChildProcessSpawner } from "effect/unstable/process";
+import * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner";
 import type * as EffectAcpErrors from "effect-acp/errors";
 import {
 @@ -10,17 +10,12 @@ import {
   resolveCursorAcpBaseModelId,
   resolveCursorAcpConfigUpdates,
 } from "../Layers/CursorProvider.ts";
-import {
+import * as AcpSessionRuntime from "./AcpSessionRuntime.ts";
-  AcpSessionRuntime,
-  type AcpSessionRuntimeOptions,
-  type AcpSessionRuntimeShape,
-  type AcpSpawnInput,
-} from "./AcpSessionRuntime.ts";
 type CursorAcpRuntimeCursorSettings = Pick<CursorSettings, "apiEndpoint" | "binaryPath">;
 export interface CursorAcpRuntimeInput extends Omit<
-  AcpSessionRuntimeOptions,
+  AcpSessionRuntime.AcpSessionRuntimeOptions,
   "authMethodId" | "clientCapabilities" | "spawn"
 > {
   readonly childProcessSpawner: ChildProcessSpawner.ChildProcessSpawner["Service"];
 @@ -38,7 +33,7 @@ export function buildCursorAcpSpawnInput(
   cursorSettings: CursorAcpRuntimeCursorSettings | null | undefined,
   cwd: string,
   environment?: NodeJS.ProcessEnv,
-): AcpSpawnInput {
+): AcpSessionRuntime.AcpSpawnInput {
   return {
     command: cursorSettings?.binaryPath || "agent",
     args: [
 @@ -52,7 +47,11 @@ export function buildCursorAcpSpawnInput(
 export const makeCursorAcpRuntime = (
   input: CursorAcpRuntimeInput,
-): Effect.Effect<AcpSessionRuntimeShape, EffectAcpErrors.AcpError, Scope.Scope> =>
+): Effect.Effect<
+  AcpSessionRuntime.AcpSessionRuntime["Service"],
+  EffectAcpErrors.AcpError,
+  Scope.Scope
+> =>
   Effect.gen(function* () {
     const acpContext = yield* Layer.build(
       AcpSessionRuntime.layer({
 @@ -66,11 +65,13 @@ export const makeCursorAcpRuntime = (
         ),
       ),
     );
-    return yield* Effect.service(AcpSessionRuntime).pipe(Effect.provide(acpContext));
+    return yield* Effect.service(AcpSessionRuntime.AcpSessionRuntime).pipe(
+      Effect.provide(acpContext),
+    );
   });
 interface CursorAcpModelSelectionRuntime {
-  readonly getConfigOptions: AcpSessionRuntimeShape["getConfigOptions"];
+  readonly getConfigOptions: AcpSessionRuntime.AcpSessionRuntime["Service"]["getConfigOptions"];
   readonly setConfigOption: (
     configId: string,
     value: string | boolean,

apps/server/src/provider/acp/GrokAcpSupport.ts+13-12

 @@ -2,17 +2,12 @@ import { type GrokSettings, ProviderDriverKind } from "@t3tools/contracts";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Scope from "effect/Scope";
-import { ChildProcessSpawner } from "effect/unstable/process";
+import * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner";
 import * as EffectAcpErrors from "effect-acp/errors";
 import type * as EffectAcpSchema from "effect-acp/schema";
 import { normalizeModelSlug } from "@t3tools/shared/model";
-import {
+import * as AcpSessionRuntime from "./AcpSessionRuntime.ts";
-  AcpSessionRuntime,
-  type AcpSessionRuntimeOptions,
-  type AcpSessionRuntimeShape,
-  type AcpSpawnInput,
-} from "./AcpSessionRuntime.ts";
 const GROK_API_KEY_ENV = "XAI_API_KEY";
 const GROK_OAUTH2_REFERRER_ENV = "GROK_OAUTH2_REFERRER";
 @@ -24,7 +19,7 @@ const GROK_DRIVER_KIND = ProviderDriverKind.make("grok");
 type GrokAcpRuntimeGrokSettings = Pick<GrokSettings, "binaryPath">;
 interface GrokAcpRuntimeInput extends Omit<
-  AcpSessionRuntimeOptions,
+  AcpSessionRuntime.AcpSessionRuntimeOptions,
   "authMethodId" | "clientCapabilities" | "spawn"
 > {
   readonly childProcessSpawner: ChildProcessSpawner.ChildProcessSpawner["Service"];
 @@ -36,7 +31,7 @@ export function buildGrokAcpSpawnInput(
   grokSettings: GrokAcpRuntimeGrokSettings | null | undefined,
   cwd: string,
   environment?: NodeJS.ProcessEnv,
-): AcpSpawnInput {
+): AcpSessionRuntime.AcpSpawnInput {
   return {
     command: grokSettings?.binaryPath || "grok",
     args: ["agent", "stdio"],
 @@ -56,7 +51,11 @@ function resolveGrokAuthMethodId(environment: NodeJS.ProcessEnv | undefined): st
 export const makeGrokAcpRuntime = (
   input: GrokAcpRuntimeInput,
-): Effect.Effect<AcpSessionRuntimeShape, EffectAcpErrors.AcpError, Scope.Scope> =>
+): Effect.Effect<
+  AcpSessionRuntime.AcpSessionRuntime["Service"],
+  EffectAcpErrors.AcpError,
+  Scope.Scope
+> =>
   Effect.gen(function* () {
     const acpContext = yield* Layer.build(
       AcpSessionRuntime.layer({
 @@ -69,7 +68,9 @@ export const makeGrokAcpRuntime = (
         ),
       ),
     );
-    return yield* Effect.service(AcpSessionRuntime).pipe(Effect.provide(acpContext));
+    return yield* Effect.service(AcpSessionRuntime.AcpSessionRuntime).pipe(
+      Effect.provide(acpContext),
+    );
   });
 export function resolveGrokAcpBaseModelId(model: string | null | undefined): string {
 @@ -88,7 +89,7 @@ export function currentGrokModelIdFromSessionSetup(
 }
 export function applyGrokAcpModelSelection<E>(input: {
-  readonly runtime: Pick<AcpSessionRuntimeShape, "setSessionModel">;
+  readonly runtime: Pick<AcpSessionRuntime.AcpSessionRuntime["Service"], "setSessionModel">;
   readonly currentModelId: string | undefined;
   readonly requestedModelId: string | undefined;
   readonly mapError: (cause: EffectAcpErrors.AcpError) => E;

packages/effect-acp/src/agent.ts+177-176

 @@ -27,189 +27,190 @@ export interface AcpAgentOptions {
   readonly logger?: (event: AcpProtocol.AcpProtocolLogEvent) => Effect.Effect<void, never>;
 }
-export interface AcpAgentShape {
+export class AcpAgent extends Context.Service<
-  readonly raw: {
+  AcpAgent,
+  {
+    readonly raw: {
+      /**
+       * Stream of inbound ACP notifications observed on the connection.
+       */
+      readonly notifications: Stream.Stream<AcpProtocol.AcpIncomingNotification>;
+      /**
+       * Sends a generic ACP extension request.
+       * @see https://agentclientprotocol.com/protocol/extensibility
+       */
+      readonly request: (
+        method: string,
+        payload: unknown,
+      ) => Effect.Effect<unknown, AcpError.AcpError>;
+      /**
+       * Sends a generic ACP extension notification.
+       * @see https://agentclientprotocol.com/protocol/extensibility
+       */
+      readonly notify: (method: string, payload: unknown) => Effect.Effect<void, AcpError.AcpError>;
+    };
+    readonly client: {
+      /**
+       * Requests client permission for an operation.
+       * @see https://agentclientprotocol.com/protocol/schema#session/request_permission
+       */
+      readonly requestPermission: (
+        payload: AcpSchema.RequestPermissionRequest,
+      ) => Effect.Effect<AcpSchema.RequestPermissionResponse, AcpError.AcpError>;
+      /**
+       * Requests structured user input from the client.
+       * @see https://agentclientprotocol.com/protocol/schema#session/elicitation
+       */
+      readonly elicit: (
+        payload: AcpSchema.ElicitationRequest,
+      ) => Effect.Effect<AcpSchema.ElicitationResponse, AcpError.AcpError>;
+      /**
+       * Requests file contents from the client.
+       * @see https://agentclientprotocol.com/protocol/schema#fs/read_text_file
+       */
+      readonly readTextFile: (
+        payload: AcpSchema.ReadTextFileRequest,
+      ) => Effect.Effect<AcpSchema.ReadTextFileResponse, AcpError.AcpError>;
+      /**
+       * Writes a text file through the client.
+       * @see https://agentclientprotocol.com/protocol/schema#fs/write_text_file
+       */
+      readonly writeTextFile: (
+        payload: AcpSchema.WriteTextFileRequest,
+      ) => Effect.Effect<AcpSchema.WriteTextFileResponse, AcpError.AcpError>;
+      /**
+       * Creates a terminal on the client side.
+       * @see https://agentclientprotocol.com/protocol/schema#terminal/create
+       */
+      readonly createTerminal: (
+        payload: AcpSchema.CreateTerminalRequest,
+      ) => Effect.Effect<AcpTerminal.AcpTerminal, AcpError.AcpError>;
+      /**
+       * Sends a `session/update` notification to the client.
+       * @see https://agentclientprotocol.com/protocol/schema#session/update
+       */
+      readonly sessionUpdate: (
+        payload: AcpSchema.SessionNotification,
+      ) => Effect.Effect<void, AcpError.AcpError>;
+      /**
+       * Sends a `session/elicitation/complete` notification to the client.
+       * @see https://agentclientprotocol.com/protocol/schema#session/elicitation/complete
+       */
+      readonly elicitationComplete: (
+        payload: AcpSchema.ElicitationCompleteNotification,
+      ) => Effect.Effect<void, AcpError.AcpError>;
+      /**
+       * Sends an ACP extension request to the client.
+       * @see https://agentclientprotocol.com/protocol/extensibility
+       */
+      readonly extRequest: (
+        method: string,
+        payload: unknown,
+      ) => Effect.Effect<unknown, AcpError.AcpError>;
+      /**
+       * Sends an ACP extension notification to the client.
+       * @see https://agentclientprotocol.com/protocol/extensibility
+       */
+      readonly extNotification: (
+        method: string,
+        payload: unknown,
+      ) => Effect.Effect<void, AcpError.AcpError>;
+    };
     /**
-     * Stream of inbound ACP notifications observed on the connection.
+     * Registers a handler for `initialize`.
+     * @see https://agentclientprotocol.com/protocol/schema#initialize
      */
-    readonly notifications: Stream.Stream<AcpProtocol.AcpIncomingNotification>;
+    readonly handleInitialize: (
+      handler: (
+        request: AcpSchema.InitializeRequest,
+      ) => Effect.Effect<AcpSchema.InitializeResponse, AcpError.AcpError>,
+    ) => Effect.Effect<void>;
     /**
-     * Sends a generic ACP extension request.
+     * Registers a handler for `authenticate`.
-     * @see https://agentclientprotocol.com/protocol/extensibility
+     * @see https://agentclientprotocol.com/protocol/schema#authenticate
      */
-    readonly request: (
+    readonly handleAuthenticate: (
-      method: string,
+      handler: (
-      payload: unknown,
+        request: AcpSchema.AuthenticateRequest,
-    ) => Effect.Effect<unknown, AcpError.AcpError>;
+      ) => Effect.Effect<AcpSchema.AuthenticateResponse, AcpError.AcpError>,
-    /**
+    ) => Effect.Effect<void>;
-     * Sends a generic ACP extension notification.
+    readonly handleLogout: (
-     * @see https://agentclientprotocol.com/protocol/extensibility
+      handler: (
-     */
+        request: AcpSchema.LogoutRequest,
-    readonly notify: (method: string, payload: unknown) => Effect.Effect<void, AcpError.AcpError>;
+      ) => Effect.Effect<AcpSchema.LogoutResponse, AcpError.AcpError>,
-  };
+    ) => Effect.Effect<void>;
-  readonly client: {
+    readonly handleCreateSession: (
-    /**
+      handler: (
-     * Requests client permission for an operation.
+        request: AcpSchema.NewSessionRequest,
-     * @see https://agentclientprotocol.com/protocol/schema#session/request_permission
+      ) => Effect.Effect<AcpSchema.NewSessionResponse, AcpError.AcpError>,
-     */
+    ) => Effect.Effect<void>;
-    readonly requestPermission: (
+    readonly handleLoadSession: (
-      payload: AcpSchema.RequestPermissionRequest,
+      handler: (
-    ) => Effect.Effect<AcpSchema.RequestPermissionResponse, AcpError.AcpError>;
+        request: AcpSchema.LoadSessionRequest,
-    /**
+      ) => Effect.Effect<AcpSchema.LoadSessionResponse, AcpError.AcpError>,
-     * Requests structured user input from the client.
+    ) => Effect.Effect<void>;
-     * @see https://agentclientprotocol.com/protocol/schema#session/elicitation
+    readonly handleListSessions: (
-     */
+      handler: (
-    readonly elicit: (
+        request: AcpSchema.ListSessionsRequest,
-      payload: AcpSchema.ElicitationRequest,
+      ) => Effect.Effect<AcpSchema.ListSessionsResponse, AcpError.AcpError>,
-    ) => Effect.Effect<AcpSchema.ElicitationResponse, AcpError.AcpError>;
+    ) => Effect.Effect<void>;
-    /**
+    readonly handleForkSession: (
-     * Requests file contents from the client.
+      handler: (
-     * @see https://agentclientprotocol.com/protocol/schema#fs/read_text_file
+        request: AcpSchema.ForkSessionRequest,
-     */
+      ) => Effect.Effect<AcpSchema.ForkSessionResponse, AcpError.AcpError>,
-    readonly readTextFile: (
+    ) => Effect.Effect<void>;
-      payload: AcpSchema.ReadTextFileRequest,
+    readonly handleResumeSession: (
-    ) => Effect.Effect<AcpSchema.ReadTextFileResponse, AcpError.AcpError>;
+      handler: (
-    /**
+        request: AcpSchema.ResumeSessionRequest,
-     * Writes a text file through the client.
+      ) => Effect.Effect<AcpSchema.ResumeSessionResponse, AcpError.AcpError>,
-     * @see https://agentclientprotocol.com/protocol/schema#fs/write_text_file
+    ) => Effect.Effect<void>;
-     */
+    readonly handleCloseSession: (
-    readonly writeTextFile: (
+      handler: (
-      payload: AcpSchema.WriteTextFileRequest,
+        request: AcpSchema.CloseSessionRequest,
-    ) => Effect.Effect<AcpSchema.WriteTextFileResponse, AcpError.AcpError>;
+      ) => Effect.Effect<AcpSchema.CloseSessionResponse, AcpError.AcpError>,
+    ) => Effect.Effect<void>;
+    readonly handleSetSessionModel: (
+      handler: (
+        request: AcpSchema.SetSessionModelRequest,
+      ) => Effect.Effect<AcpSchema.SetSessionModelResponse, AcpError.AcpError>,
+    ) => Effect.Effect<void>;
+    readonly handleSetSessionConfigOption: (
+      handler: (
+        request: AcpSchema.SetSessionConfigOptionRequest,
+      ) => Effect.Effect<AcpSchema.SetSessionConfigOptionResponse, AcpError.AcpError>,
+    ) => Effect.Effect<void>;
+    readonly handlePrompt: (
+      handler: (
+        request: AcpSchema.PromptRequest,
+      ) => Effect.Effect<AcpSchema.PromptResponse, AcpError.AcpError>,
+    ) => Effect.Effect<void>;
     /**
-     * Creates a terminal on the client side.
+     * Registers a handler for `session/cancel`.
-     * @see https://agentclientprotocol.com/protocol/schema#terminal/create
+     * @see https://agentclientprotocol.com/protocol/schema#session/cancel
      */
-    readonly createTerminal: (
+    readonly handleCancel: (
-      payload: AcpSchema.CreateTerminalRequest,
+      handler: (
-    ) => Effect.Effect<AcpTerminal.AcpTerminal, AcpError.AcpError>;
+        notification: AcpSchema.CancelNotification,
-    /**
+      ) => Effect.Effect<void, AcpError.AcpError>,
-     * Sends a `session/update` notification to the client.
+    ) => Effect.Effect<void>;
-     * @see https://agentclientprotocol.com/protocol/schema#session/update
+    readonly handleUnknownExtRequest: (
-     */
+      handler: (method: string, params: unknown) => Effect.Effect<unknown, AcpError.AcpError>,
-    readonly sessionUpdate: (
+    ) => Effect.Effect<void>;
-      payload: AcpSchema.SessionNotification,
+    readonly handleUnknownExtNotification: (
-    ) => Effect.Effect<void, AcpError.AcpError>;
+      handler: (method: string, params: unknown) => Effect.Effect<void, AcpError.AcpError>,
-    /**
+    ) => Effect.Effect<void>;
-     * Sends a `session/elicitation/complete` notification to the client.
+    readonly handleExtRequest: <A, I>(
-     * @see https://agentclientprotocol.com/protocol/schema#session/elicitation/complete
-     */
-    readonly elicitationComplete: (
-      payload: AcpSchema.ElicitationCompleteNotification,
-    ) => Effect.Effect<void, AcpError.AcpError>;
-    /**
-     * Sends an ACP extension request to the client.
-     * @see https://agentclientprotocol.com/protocol/extensibility
-     */
-    readonly extRequest: (
       method: string,
-      payload: unknown,
+      payload: Schema.Codec<A, I>,
-    ) => Effect.Effect<unknown, AcpError.AcpError>;
+      handler: (payload: A) => Effect.Effect<unknown, AcpError.AcpError>,
-    /**
+    ) => Effect.Effect<void>;
-     * Sends an ACP extension notification to the client.
+    readonly handleExtNotification: <A, I>(
-     * @see https://agentclientprotocol.com/protocol/extensibility
-     */
-    readonly extNotification: (
       method: string,
-      payload: unknown,
+      payload: Schema.Codec<A, I>,
-    ) => Effect.Effect<void, AcpError.AcpError>;
+      handler: (payload: A) => Effect.Effect<void, AcpError.AcpError>,
-  };
+    ) => Effect.Effect<void>;
-  /**
+  }
-   * Registers a handler for `initialize`.
+>()("effect-acp/agent/AcpAgent") {}
-   * @see https://agentclientprotocol.com/protocol/schema#initialize
-   */
-  readonly handleInitialize: (
-    handler: (
-      request: AcpSchema.InitializeRequest,
-    ) => Effect.Effect<AcpSchema.InitializeResponse, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  /**
-   * Registers a handler for `authenticate`.
-   * @see https://agentclientprotocol.com/protocol/schema#authenticate
-   */
-  readonly handleAuthenticate: (
-    handler: (
-      request: AcpSchema.AuthenticateRequest,
-    ) => Effect.Effect<AcpSchema.AuthenticateResponse, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  readonly handleLogout: (
-    handler: (
-      request: AcpSchema.LogoutRequest,
-    ) => Effect.Effect<AcpSchema.LogoutResponse, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  readonly handleCreateSession: (
-    handler: (
-      request: AcpSchema.NewSessionRequest,
-    ) => Effect.Effect<AcpSchema.NewSessionResponse, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  readonly handleLoadSession: (
-    handler: (
-      request: AcpSchema.LoadSessionRequest,
-    ) => Effect.Effect<AcpSchema.LoadSessionResponse, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  readonly handleListSessions: (
-    handler: (
-      request: AcpSchema.ListSessionsRequest,
-    ) => Effect.Effect<AcpSchema.ListSessionsResponse, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  readonly handleForkSession: (
-    handler: (
-      request: AcpSchema.ForkSessionRequest,
-    ) => Effect.Effect<AcpSchema.ForkSessionResponse, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  readonly handleResumeSession: (
-    handler: (
-      request: AcpSchema.ResumeSessionRequest,
-    ) => Effect.Effect<AcpSchema.ResumeSessionResponse, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  readonly handleCloseSession: (
-    handler: (
-      request: AcpSchema.CloseSessionRequest,
-    ) => Effect.Effect<AcpSchema.CloseSessionResponse, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  readonly handleSetSessionModel: (
-    handler: (
-      request: AcpSchema.SetSessionModelRequest,
-    ) => Effect.Effect<AcpSchema.SetSessionModelResponse, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  readonly handleSetSessionConfigOption: (
-    handler: (
-      request: AcpSchema.SetSessionConfigOptionRequest,
-    ) => Effect.Effect<AcpSchema.SetSessionConfigOptionResponse, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  readonly handlePrompt: (
-    handler: (
-      request: AcpSchema.PromptRequest,
-    ) => Effect.Effect<AcpSchema.PromptResponse, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  /**
-   * Registers a handler for `session/cancel`.
-   * @see https://agentclientprotocol.com/protocol/schema#session/cancel
-   */
-  readonly handleCancel: (
-    handler: (notification: AcpSchema.CancelNotification) => Effect.Effect<void, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  readonly handleUnknownExtRequest: (
-    handler: (method: string, params: unknown) => Effect.Effect<unknown, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  readonly handleUnknownExtNotification: (
-    handler: (method: string, params: unknown) => Effect.Effect<void, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  readonly handleExtRequest: <A, I>(
-    method: string,
-    payload: Schema.Codec<A, I>,
-    handler: (payload: A) => Effect.Effect<unknown, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  readonly handleExtNotification: <A, I>(
-    method: string,
-    payload: Schema.Codec<A, I>,
-    handler: (payload: A) => Effect.Effect<void, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-}
-export class AcpAgent extends Context.Service<AcpAgent, AcpAgentShape>()(
-  "effect-acp/agent/AcpAgent",
-) {}
 interface AcpCoreAgentRequestHandlers {
   initialize?: (
 @@ -255,7 +256,7 @@ const decodeCancelNotification = Schema.decodeUnknownEffect(AcpSchema.CancelNoti
 export const make = Effect.fn("effect-acp/AcpAgent.make")(function* (
   stdio: Stdio.Stdio,
   options: AcpAgentOptions = {},
-): Effect.fn.Return<AcpAgentShape, never, Scope.Scope> {
+): Effect.fn.Return<AcpAgent["Service"], never, Scope.Scope> {
   const coreHandlers: AcpCoreAgentRequestHandlers = {};
   const cancelHandlers: Array<
     (notification: AcpSchema.CancelNotification) => Effect.Effect<void, AcpError.AcpError>

packages/effect-acp/src/client.ts+209-207

 @@ -7,7 +7,7 @@ import * as Scope from "effect/Scope";
 import * as Stream from "effect/Stream";
 import * as RpcClient from "effect/unstable/rpc/RpcClient";
 import * as RpcServer from "effect/unstable/rpc/RpcServer";
-import { ChildProcessSpawner } from "effect/unstable/process";
+import * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner";
 import * as AcpError from "./errors.ts";
 import * as AcpProtocol from "./protocol.ts";
 @@ -34,237 +34,236 @@ type AcpClientRaw = {
   readonly notify: (method: string, payload: unknown) => Effect.Effect<void, AcpError.AcpError>;
 };
-export interface AcpClientShape {
+export class AcpClient extends Context.Service<
-  readonly raw: AcpClientRaw;
+  AcpClient,
-  readonly agent: {
+  {
+    readonly raw: AcpClientRaw;
+    readonly agent: {
+      /**
+       * Initializes the ACP session and negotiates capabilities.
+       * @see https://agentclientprotocol.com/protocol/schema#initialize
+       */
+      readonly initialize: (
+        payload: AcpSchema.InitializeRequest,
+      ) => Effect.Effect<AcpSchema.InitializeResponse, AcpError.AcpError>;
+      /**
+       * Performs ACP authentication when the agent requires it.
+       * @see https://agentclientprotocol.com/protocol/schema#authenticate
+       */
+      readonly authenticate: (
+        payload: AcpSchema.AuthenticateRequest,
+      ) => Effect.Effect<AcpSchema.AuthenticateResponse, AcpError.AcpError>;
+      /**
+       * Logs out the current ACP identity.
+       * @see https://agentclientprotocol.com/protocol/schema#logout
+       */
+      readonly logout: (
+        payload: AcpSchema.LogoutRequest,
+      ) => Effect.Effect<AcpSchema.LogoutResponse, AcpError.AcpError>;
+      /**
+       * Starts a new ACP session.
+       * @see https://agentclientprotocol.com/protocol/schema#session/new
+       */
+      readonly createSession: (
+        payload: AcpSchema.NewSessionRequest,
+      ) => Effect.Effect<AcpSchema.NewSessionResponse, AcpError.AcpError>;
+      /**
+       * Loads a previously saved ACP session.
+       * @see https://agentclientprotocol.com/protocol/schema#session/load
+       */
+      readonly loadSession: (
+        payload: AcpSchema.LoadSessionRequest,
+      ) => Effect.Effect<AcpSchema.LoadSessionResponse, AcpError.AcpError>;
+      /**
+       * Lists available ACP sessions.
+       * @see https://agentclientprotocol.com/protocol/schema#session/list
+       */
+      readonly listSessions: (
+        payload: AcpSchema.ListSessionsRequest,
+      ) => Effect.Effect<AcpSchema.ListSessionsResponse, AcpError.AcpError>;
+      /**
+       * Forks an ACP session.
+       * @see https://agentclientprotocol.com/protocol/schema#session/fork
+       */
+      readonly forkSession: (
+        payload: AcpSchema.ForkSessionRequest,
+      ) => Effect.Effect<AcpSchema.ForkSessionResponse, AcpError.AcpError>;
+      /**
+       * Resumes an ACP session.
+       * @see https://agentclientprotocol.com/protocol/schema#session/resume
+       */
+      readonly resumeSession: (
+        payload: AcpSchema.ResumeSessionRequest,
+      ) => Effect.Effect<AcpSchema.ResumeSessionResponse, AcpError.AcpError>;
+      /**
+       * Closes an ACP session.
+       * @see https://agentclientprotocol.com/protocol/schema#session/close
+       */
+      readonly closeSession: (
+        payload: AcpSchema.CloseSessionRequest,
+      ) => Effect.Effect<AcpSchema.CloseSessionResponse, AcpError.AcpError>;
+      /**
+       * Selects the active model for a session.
+       * @see https://agentclientprotocol.com/protocol/schema#session/set_model
+       */
+      readonly setSessionModel: (
+        payload: AcpSchema.SetSessionModelRequest,
+      ) => Effect.Effect<AcpSchema.SetSessionModelResponse, AcpError.AcpError>;
+      /**
+       * Updates a session configuration option.
+       * @see https://agentclientprotocol.com/protocol/schema#session/set_config_option
+       */
+      readonly setSessionConfigOption: (
+        payload: AcpSchema.SetSessionConfigOptionRequest,
+      ) => Effect.Effect<AcpSchema.SetSessionConfigOptionResponse, AcpError.AcpError>;
+      /**
+       * Sends a prompt turn to the agent.
+       * @see https://agentclientprotocol.com/protocol/schema#session/prompt
+       */
+      readonly prompt: (
+        payload: AcpSchema.PromptRequest,
+      ) => Effect.Effect<AcpSchema.PromptResponse, AcpError.AcpError>;
+      /**
+       * Sends a real ACP `session/cancel` notification.
+       * @see https://agentclientprotocol.com/protocol/schema#session/cancel
+       */
+      readonly cancel: (
+        payload: AcpSchema.CancelNotification,
+      ) => Effect.Effect<void, AcpError.AcpError>;
+    };
     /**
-     * Initializes the ACP session and negotiates capabilities.
+     * Registers a handler for `session/request_permission`.
-     * @see https://agentclientprotocol.com/protocol/schema#initialize
+     * @see https://agentclientprotocol.com/protocol/schema#session/request_permission
      */
-    readonly initialize: (
+    readonly handleRequestPermission: (
-      payload: AcpSchema.InitializeRequest,
+      handler: (
-    ) => Effect.Effect<AcpSchema.InitializeResponse, AcpError.AcpError>;
+        request: AcpSchema.RequestPermissionRequest,
+      ) => Effect.Effect<AcpSchema.RequestPermissionResponse, AcpError.AcpError>,
+    ) => Effect.Effect<void>;
     /**
-     * Performs ACP authentication when the agent requires it.
+     * Registers a handler for `session/elicitation`.
-     * @see https://agentclientprotocol.com/protocol/schema#authenticate
+     * @see https://agentclientprotocol.com/protocol/schema#session/elicitation
      */
-    readonly authenticate: (
+    readonly handleElicitation: (
-      payload: AcpSchema.AuthenticateRequest,
+      handler: (
-    ) => Effect.Effect<AcpSchema.AuthenticateResponse, AcpError.AcpError>;
+        request: AcpSchema.ElicitationRequest,
+      ) => Effect.Effect<AcpSchema.ElicitationResponse, AcpError.AcpError>,
+    ) => Effect.Effect<void>;
     /**
-     * Logs out the current ACP identity.
+     * Registers a handler for `fs/read_text_file`.
-     * @see https://agentclientprotocol.com/protocol/schema#logout
+     * @see https://agentclientprotocol.com/protocol/schema#fs/read_text_file
      */
-    readonly logout: (
+    readonly handleReadTextFile: (
-      payload: AcpSchema.LogoutRequest,
+      handler: (
-    ) => Effect.Effect<AcpSchema.LogoutResponse, AcpError.AcpError>;
+        request: AcpSchema.ReadTextFileRequest,
+      ) => Effect.Effect<AcpSchema.ReadTextFileResponse, AcpError.AcpError>,
+    ) => Effect.Effect<void>;
     /**
-     * Starts a new ACP session.
+     * Registers a handler for `fs/write_text_file`.
-     * @see https://agentclientprotocol.com/protocol/schema#session/new
+     * @see https://agentclientprotocol.com/protocol/schema#fs/write_text_file
      */
-    readonly createSession: (
+    readonly handleWriteTextFile: (
-      payload: AcpSchema.NewSessionRequest,
+      handler: (
-    ) => Effect.Effect<AcpSchema.NewSessionResponse, AcpError.AcpError>;
+        request: AcpSchema.WriteTextFileRequest,
+      ) => Effect.Effect<AcpSchema.WriteTextFileResponse | void, AcpError.AcpError>,
+    ) => Effect.Effect<void>;
     /**
-     * Loads a previously saved ACP session.
+     * Registers a handler for `terminal/create`.
-     * @see https://agentclientprotocol.com/protocol/schema#session/load
+     * @see https://agentclientprotocol.com/protocol/schema#terminal/create
      */
-    readonly loadSession: (
+    readonly handleCreateTerminal: (
-      payload: AcpSchema.LoadSessionRequest,
+      handler: (
-    ) => Effect.Effect<AcpSchema.LoadSessionResponse, AcpError.AcpError>;
+        request: AcpSchema.CreateTerminalRequest,
+      ) => Effect.Effect<AcpSchema.CreateTerminalResponse, AcpError.AcpError>,
+    ) => Effect.Effect<void>;
     /**
-     * Lists available ACP sessions.
+     * Registers a handler for `terminal/output`.
-     * @see https://agentclientprotocol.com/protocol/schema#session/list
+     * @see https://agentclientprotocol.com/protocol/schema#terminal/output
      */
-    readonly listSessions: (
+    readonly handleTerminalOutput: (
-      payload: AcpSchema.ListSessionsRequest,
+      handler: (
-    ) => Effect.Effect<AcpSchema.ListSessionsResponse, AcpError.AcpError>;
+        request: AcpSchema.TerminalOutputRequest,
+      ) => Effect.Effect<AcpSchema.TerminalOutputResponse, AcpError.AcpError>,
+    ) => Effect.Effect<void>;
     /**
-     * Forks an ACP session.
+     * Registers a handler for `terminal/wait_for_exit`.
-     * @see https://agentclientprotocol.com/protocol/schema#session/fork
+     * @see https://agentclientprotocol.com/protocol/schema#terminal/wait_for_exit
      */
-    readonly forkSession: (
+    readonly handleTerminalWaitForExit: (
-      payload: AcpSchema.ForkSessionRequest,
+      handler: (
-    ) => Effect.Effect<AcpSchema.ForkSessionResponse, AcpError.AcpError>;
+        request: AcpSchema.WaitForTerminalExitRequest,
+      ) => Effect.Effect<AcpSchema.WaitForTerminalExitResponse, AcpError.AcpError>,
+    ) => Effect.Effect<void>;
     /**
-     * Resumes an ACP session.
+     * Registers a handler for `terminal/kill`.
-     * @see https://agentclientprotocol.com/protocol/schema#session/resume
+     * @see https://agentclientprotocol.com/protocol/schema#terminal/kill
      */
-    readonly resumeSession: (
+    readonly handleTerminalKill: (
-      payload: AcpSchema.ResumeSessionRequest,
+      handler: (
-    ) => Effect.Effect<AcpSchema.ResumeSessionResponse, AcpError.AcpError>;
+        request: AcpSchema.KillTerminalRequest,
+      ) => Effect.Effect<AcpSchema.KillTerminalResponse | void, AcpError.AcpError>,
+    ) => Effect.Effect<void>;
     /**
-     * Closes an ACP session.
+     * Registers a handler for `terminal/release`.
-     * @see https://agentclientprotocol.com/protocol/schema#session/close
+     * @see https://agentclientprotocol.com/protocol/schema#terminal/release
      */
-    readonly closeSession: (
+    readonly handleTerminalRelease: (
-      payload: AcpSchema.CloseSessionRequest,
+      handler: (
-    ) => Effect.Effect<AcpSchema.CloseSessionResponse, AcpError.AcpError>;
+        request: AcpSchema.ReleaseTerminalRequest,
+      ) => Effect.Effect<AcpSchema.ReleaseTerminalResponse | void, AcpError.AcpError>,
+    ) => Effect.Effect<void>;
     /**
-     * Selects the active model for a session.
+     * Registers a handler for `session/update`.
-     * @see https://agentclientprotocol.com/protocol/schema#session/set_model
+     * @see https://agentclientprotocol.com/protocol/schema#session/update
      */
-    readonly setSessionModel: (
+    readonly handleSessionUpdate: (
-      payload: AcpSchema.SetSessionModelRequest,
+      handler: (
-    ) => Effect.Effect<AcpSchema.SetSessionModelResponse, AcpError.AcpError>;
+        notification: AcpSchema.SessionNotification,
+      ) => Effect.Effect<void, AcpError.AcpError>,
+    ) => Effect.Effect<void>;
     /**
-     * Updates a session configuration option.
+     * Registers a handler for `session/elicitation/complete`.
-     * @see https://agentclientprotocol.com/protocol/schema#session/set_config_option
+     * @see https://agentclientprotocol.com/protocol/schema#session/elicitation/complete
      */
-    readonly setSessionConfigOption: (
+    readonly handleElicitationComplete: (
-      payload: AcpSchema.SetSessionConfigOptionRequest,
+      handler: (
-    ) => Effect.Effect<AcpSchema.SetSessionConfigOptionResponse, AcpError.AcpError>;
+        notification: AcpSchema.ElicitationCompleteNotification,
+      ) => Effect.Effect<void, AcpError.AcpError>,
+    ) => Effect.Effect<void>;
     /**
-     * Sends a prompt turn to the agent.
+     * Registers a fallback extension request handler.
-     * @see https://agentclientprotocol.com/protocol/schema#session/prompt
+     * @see https://agentclientprotocol.com/protocol/extensibility
      */
-    readonly prompt: (
+    readonly handleUnknownExtRequest: (
-      payload: AcpSchema.PromptRequest,
+      handler: (method: string, params: unknown) => Effect.Effect<unknown, AcpError.AcpError>,
-    ) => Effect.Effect<AcpSchema.PromptResponse, AcpError.AcpError>;
+    ) => Effect.Effect<void>;
     /**
-     * Sends a real ACP `session/cancel` notification.
+     * Registers a fallback extension notification handler.
-     * @see https://agentclientprotocol.com/protocol/schema#session/cancel
+     * @see https://agentclientprotocol.com/protocol/extensibility
      */
-    readonly cancel: (
+    readonly handleUnknownExtNotification: (
-      payload: AcpSchema.CancelNotification,
+      handler: (method: string, params: unknown) => Effect.Effect<void, AcpError.AcpError>,
-    ) => Effect.Effect<void, AcpError.AcpError>;
+    ) => Effect.Effect<void>;
-  };
+    /**
-  /**
+     * Registers a typed extension request handler.
-   * Registers a handler for `session/request_permission`.
+     * @see https://agentclientprotocol.com/protocol/extensibility
-   * @see https://agentclientprotocol.com/protocol/schema#session/request_permission
+     */
-   */
+    readonly handleExtRequest: <A, I>(
-  readonly handleRequestPermission: (
+      method: string,
-    handler: (
+      payload: Schema.Codec<A, I>,
-      request: AcpSchema.RequestPermissionRequest,
+      handler: (payload: A) => Effect.Effect<unknown, AcpError.AcpError>,
-    ) => Effect.Effect<AcpSchema.RequestPermissionResponse, AcpError.AcpError>,
+    ) => Effect.Effect<void>;
-  ) => Effect.Effect<void>;
+    /**
-  /**
+     * Registers a typed extension notification handler.
-   * Registers a handler for `session/elicitation`.
+     * @see https://agentclientprotocol.com/protocol/extensibility
-   * @see https://agentclientprotocol.com/protocol/schema#session/elicitation
+     */
-   */
+    readonly handleExtNotification: <A, I>(
-  readonly handleElicitation: (
+      method: string,
-    handler: (
+      payload: Schema.Codec<A, I>,
-      request: AcpSchema.ElicitationRequest,
+      handler: (payload: A) => Effect.Effect<void, AcpError.AcpError>,
-    ) => Effect.Effect<AcpSchema.ElicitationResponse, AcpError.AcpError>,
+    ) => Effect.Effect<void>;
-  ) => Effect.Effect<void>;
+  }
-  /**
+>()("effect-acp/client/AcpClient") {}
-   * Registers a handler for `fs/read_text_file`.
-   * @see https://agentclientprotocol.com/protocol/schema#fs/read_text_file
-   */
-  readonly handleReadTextFile: (
-    handler: (
-      request: AcpSchema.ReadTextFileRequest,
-    ) => Effect.Effect<AcpSchema.ReadTextFileResponse, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  /**
-   * Registers a handler for `fs/write_text_file`.
-   * @see https://agentclientprotocol.com/protocol/schema#fs/write_text_file
-   */
-  readonly handleWriteTextFile: (
-    handler: (
-      request: AcpSchema.WriteTextFileRequest,
-    ) => Effect.Effect<AcpSchema.WriteTextFileResponse | void, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  /**
-   * Registers a handler for `terminal/create`.
-   * @see https://agentclientprotocol.com/protocol/schema#terminal/create
-   */
-  readonly handleCreateTerminal: (
-    handler: (
-      request: AcpSchema.CreateTerminalRequest,
-    ) => Effect.Effect<AcpSchema.CreateTerminalResponse, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  /**
-   * Registers a handler for `terminal/output`.
-   * @see https://agentclientprotocol.com/protocol/schema#terminal/output
-   */
-  readonly handleTerminalOutput: (
-    handler: (
-      request: AcpSchema.TerminalOutputRequest,
-    ) => Effect.Effect<AcpSchema.TerminalOutputResponse, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  /**
-   * Registers a handler for `terminal/wait_for_exit`.
-   * @see https://agentclientprotocol.com/protocol/schema#terminal/wait_for_exit
-   */
-  readonly handleTerminalWaitForExit: (
-    handler: (
-      request: AcpSchema.WaitForTerminalExitRequest,
-    ) => Effect.Effect<AcpSchema.WaitForTerminalExitResponse, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  /**
-   * Registers a handler for `terminal/kill`.
-   * @see https://agentclientprotocol.com/protocol/schema#terminal/kill
-   */
-  readonly handleTerminalKill: (
-    handler: (
-      request: AcpSchema.KillTerminalRequest,
-    ) => Effect.Effect<AcpSchema.KillTerminalResponse | void, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  /**
-   * Registers a handler for `terminal/release`.
-   * @see https://agentclientprotocol.com/protocol/schema#terminal/release
-   */
-  readonly handleTerminalRelease: (
-    handler: (
-      request: AcpSchema.ReleaseTerminalRequest,
-    ) => Effect.Effect<AcpSchema.ReleaseTerminalResponse | void, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  /**
-   * Registers a handler for `session/update`.
-   * @see https://agentclientprotocol.com/protocol/schema#session/update
-   */
-  readonly handleSessionUpdate: (
-    handler: (
-      notification: AcpSchema.SessionNotification,
-    ) => Effect.Effect<void, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  /**
-   * Registers a handler for `session/elicitation/complete`.
-   * @see https://agentclientprotocol.com/protocol/schema#session/elicitation/complete
-   */
-  readonly handleElicitationComplete: (
-    handler: (
-      notification: AcpSchema.ElicitationCompleteNotification,
-    ) => Effect.Effect<void, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  /**
-   * Registers a fallback extension request handler.
-   * @see https://agentclientprotocol.com/protocol/extensibility
-   */
-  readonly handleUnknownExtRequest: (
-    handler: (method: string, params: unknown) => Effect.Effect<unknown, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  /**
-   * Registers a fallback extension notification handler.
-   * @see https://agentclientprotocol.com/protocol/extensibility
-   */
-  readonly handleUnknownExtNotification: (
-    handler: (method: string, params: unknown) => Effect.Effect<void, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  /**
-   * Registers a typed extension request handler.
-   * @see https://agentclientprotocol.com/protocol/extensibility
-   */
-  readonly handleExtRequest: <A, I>(
-    method: string,
-    payload: Schema.Codec<A, I>,
-    handler: (payload: A) => Effect.Effect<unknown, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-  /**
-   * Registers a typed extension notification handler.
-   * @see https://agentclientprotocol.com/protocol/extensibility
-   */
-  readonly handleExtNotification: <A, I>(
-    method: string,
-    payload: Schema.Codec<A, I>,
-    handler: (payload: A) => Effect.Effect<void, AcpError.AcpError>,
-  ) => Effect.Effect<void>;
-}
-export class AcpClient extends Context.Service<AcpClient, AcpClientShape>()(
-  "effect-acp/client/AcpClient",
-) {}
 interface AcpCoreRequestHandlers {
   requestPermission?: (
 @@ -310,7 +309,7 @@ export const make = Effect.fn("effect-acp/AcpClient.make")(function* (
   stdio: Stdio.Stdio,
   options: AcpClientOptions = {},
   terminationError?: Effect.Effect<AcpError.AcpError>,
-): Effect.fn.Return<AcpClientShape, never, Scope.Scope> {
+): Effect.fn.Return<AcpClient["Service"], never, Scope.Scope> {
   const coreHandlers: AcpCoreRequestHandlers = {};
   const notificationHandlers: AcpNotificationHandlers = {
     sessionUpdate: { handlers: [], pending: [] },
 @@ -559,6 +558,9 @@ export const make = Effect.fn("effect-acp/AcpClient.make")(function* (
   });
 });
+export const layer = (stdio: Stdio.Stdio, options: AcpClientOptions = {}): Layer.Layer<AcpClient> =>
+  Layer.effect(AcpClient, make(stdio, options));
 export const layerChildProcess = (
   handle: ChildProcessSpawner.ChildProcessHandle,
   options: AcpClientOptions = {},

packages/effect-acp/src/errors.ts+5-1

 @@ -45,7 +45,11 @@ export class AcpTransportError extends Schema.TaggedErrorClass<AcpTransportError
     detail: Schema.String,
     cause: Schema.Defect(),
   },
-) {}
+) {
+  override get message() {
+    return this.detail;
+  }
+}
 export class AcpRequestError extends Schema.TaggedErrorClass<AcpRequestError>()("AcpRequestError", {
   code: AcpSchema.ErrorCode,

packages/effect-codex-app-server/src/client.ts+45-39

 @@ -5,7 +5,7 @@ import * as Schema from "effect/Schema";
 import * as Scope from "effect/Scope";
 import * as Stdio from "effect/Stdio";
 import * as Stream from "effect/Stream";
-import { ChildProcessSpawner } from "effect/unstable/process";
+import * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner";
 import * as CodexRpc from "./_generated/meta.gen.ts";
 import * as CodexError from "./errors.ts";
 @@ -35,45 +35,46 @@ interface CodexAppServerClientRaw {
   readonly respondError: CodexProtocol.CodexAppServerPatchedProtocol["respondError"];
 }
-export interface CodexAppServerClientShape {
-  readonly raw: CodexAppServerClientRaw;
-  readonly request: <M extends CodexRpc.ClientRequestMethod>(
-    method: M,
-    payload: CodexRpc.ClientRequestParamsByMethod[M],
-  ) => Effect.Effect<CodexRpc.ClientRequestResponsesByMethod[M], CodexError.CodexAppServerError>;
-  readonly notify: <M extends CodexRpc.ClientNotificationMethod>(
-    method: M,
-    payload: CodexRpc.ClientNotificationParamsByMethod[M],
-  ) => Effect.Effect<void, CodexError.CodexAppServerError>;
-  readonly handleServerRequest: <M extends CodexRpc.ServerRequestMethod>(
-    method: M,
-    handler: (
-      payload: CodexRpc.ServerRequestParamsByMethod[M],
-    ) => Effect.Effect<CodexRpc.ServerRequestResponsesByMethod[M], CodexError.CodexAppServerError>,
-  ) => Effect.Effect<void>;
-  readonly handleServerNotification: <M extends CodexRpc.ServerNotificationMethod>(
-    method: M,
-    handler: (
-      payload: CodexRpc.ServerNotificationParamsByMethod[M],
-    ) => Effect.Effect<void, CodexError.CodexAppServerError>,
-  ) => Effect.Effect<void>;
-  readonly handleUnknownServerRequest: (
-    handler: (
-      method: string,
-      params: unknown,
-    ) => Effect.Effect<unknown, CodexError.CodexAppServerError>,
-  ) => Effect.Effect<void>;
-  readonly handleUnknownServerNotification: (
-    handler: (
-      method: string,
-      params: unknown,
-    ) => Effect.Effect<void, CodexError.CodexAppServerError>,
-  ) => Effect.Effect<void>;
-}
 export class CodexAppServerClient extends Context.Service<
   CodexAppServerClient,
-  CodexAppServerClientShape
+  {
+    readonly raw: CodexAppServerClientRaw;
+    readonly request: <M extends CodexRpc.ClientRequestMethod>(
+      method: M,
+      payload: CodexRpc.ClientRequestParamsByMethod[M],
+    ) => Effect.Effect<CodexRpc.ClientRequestResponsesByMethod[M], CodexError.CodexAppServerError>;
+    readonly notify: <M extends CodexRpc.ClientNotificationMethod>(
+      method: M,
+      payload: CodexRpc.ClientNotificationParamsByMethod[M],
+    ) => Effect.Effect<void, CodexError.CodexAppServerError>;
+    readonly handleServerRequest: <M extends CodexRpc.ServerRequestMethod>(
+      method: M,
+      handler: (
+        payload: CodexRpc.ServerRequestParamsByMethod[M],
+      ) => Effect.Effect<
+        CodexRpc.ServerRequestResponsesByMethod[M],
+        CodexError.CodexAppServerError
+      >,
+    ) => Effect.Effect<void>;
+    readonly handleServerNotification: <M extends CodexRpc.ServerNotificationMethod>(
+      method: M,
+      handler: (
+        payload: CodexRpc.ServerNotificationParamsByMethod[M],
+      ) => Effect.Effect<void, CodexError.CodexAppServerError>,
+    ) => Effect.Effect<void>;
+    readonly handleUnknownServerRequest: (
+      handler: (
+        method: string,
+        params: unknown,
+      ) => Effect.Effect<unknown, CodexError.CodexAppServerError>,
+    ) => Effect.Effect<void>;
+    readonly handleUnknownServerNotification: (
+      handler: (
+        method: string,
+        params: unknown,
+      ) => Effect.Effect<void, CodexError.CodexAppServerError>,
+    ) => Effect.Effect<void>;
+  }
 >()("effect-codex-app-server/client/CodexAppServerClient") {}
 type ServerRequestHandler = (
 @@ -87,7 +88,7 @@ export const make = Effect.fn("effect-codex-app-server/CodexAppServerClient.make
   stdio: Stdio.Stdio,
   options: CodexAppServerClientOptions = {},
   terminationError?: Effect.Effect<CodexError.CodexAppServerError>,
-): Effect.fn.Return<CodexAppServerClientShape, never, Scope.Scope> {
+): Effect.fn.Return<CodexAppServerClient["Service"], never, Scope.Scope> {
   const requestHandlers = new Map<string, ServerRequestHandler>();
   const notificationHandlers = new Map<string, Array<ServerNotificationHandler>>();
   let unknownRequestHandler:
 @@ -249,6 +250,11 @@ export const make = Effect.fn("effect-codex-app-server/CodexAppServerClient.make
   });
 });
+export const layer = (
+  stdio: Stdio.Stdio,
+  options: CodexAppServerClientOptions = {},
+): Layer.Layer<CodexAppServerClient> => Layer.effect(CodexAppServerClient, make(stdio, options));
 export const layerChildProcess = (
   handle: ChildProcessSpawner.ChildProcessHandle,
   options: CodexAppServerClientOptions = {},

author	Julius Marminge <julius0216@outlook.com> 2026-06-19 21:11:33-07:00
committer	GitHub <noreply@github.com> 2026-06-19 21:11:33-07:00
log	742dd7af0dcb54c32774f87fd354105726c7a9db
tree	45d2a18f157ea43645a48bf8aa3bda0cf56647d7
parent	5c1ac922574340be4560eacf928237929497d11d
signature	Signed by PGP key B5690EEEBB952194

...	@@ -27,7 +27,7 @@ import * as Scope from "effect/Scope";	...	@@ -27,7 +27,7 @@ import * as Scope from "effect/Scope";
27	import * as Semaphore from "effect/Semaphore";	27	import * as Semaphore from "effect/Semaphore";
28	import * as Stream from "effect/Stream";	28	import * as Stream from "effect/Stream";
29	import * as SynchronizedRef from "effect/SynchronizedRef";	29	import * as SynchronizedRef from "effect/SynchronizedRef";
30	import { ChildProcessSpawner } from "effect/unstable/process";	30	import * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner";
31	import * as EffectAcpErrors from "effect-acp/errors";	31	import * as EffectAcpErrors from "effect-acp/errors";
32	import type * as EffectAcpSchema from "effect-acp/schema";	32	import type * as EffectAcpSchema from "effect-acp/schema";
33		33
...	@@ -41,7 +41,7 @@ import {	...	@@ -41,7 +41,7 @@ import {
41	ProviderAdapterValidationError,	41	ProviderAdapterValidationError,
42	} from "../Errors.ts";	42	} from "../Errors.ts";
43	import { mapAcpToAdapterError } from "../acp/AcpAdapterSupport.ts";	43	import { mapAcpToAdapterError } from "../acp/AcpAdapterSupport.ts";
44	import { type AcpSessionRuntimeShape } from "../acp/AcpSessionRuntime.ts";	44	import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
45	import {	45	import {
46	makeAcpAssistantItemEvent,	46	makeAcpAssistantItemEvent,
47	makeAcpContentDeltaEvent,	47	makeAcpContentDeltaEvent,
...	@@ -101,7 +101,7 @@ interface GrokSessionContext {	...	@@ -101,7 +101,7 @@ interface GrokSessionContext {
101	readonly acpSessionId: string;	101	readonly acpSessionId: string;
102	session: ProviderSession;	102	session: ProviderSession;
103	readonly scope: Scope.Closeable;	103	readonly scope: Scope.Closeable;
104	readonly acp: AcpSessionRuntimeShape;	104	readonly acp: AcpSessionRuntime.AcpSessionRuntime["Service"];
105	notificationFiber: Fiber.Fiber<void, never> \| undefined;	105	notificationFiber: Fiber.Fiber<void, never> \| undefined;
106	readonly pendingApprovals: Map<ApprovalRequestId, PendingApproval>;	106	readonly pendingApprovals: Map<ApprovalRequestId, PendingApproval>;
107	readonly pendingUserInputs: Map<ApprovalRequestId, PendingUserInput>;	107	readonly pendingUserInputs: Map<ApprovalRequestId, PendingUserInput>;

...	@@ -10,7 +10,7 @@ import * as Effect from "effect/Effect";	...	@@ -10,7 +10,7 @@ import * as Effect from "effect/Effect";
10	import * as Stream from "effect/Stream";	10	import * as Stream from "effect/Stream";
11	import { describe, expect } from "vite-plus/test";	11	import { describe, expect } from "vite-plus/test";
12		12
13	import { AcpSessionRuntime, type AcpSessionRequestLogEvent } from "./AcpSessionRuntime.ts";	13	import * as AcpSessionRuntime from "./AcpSessionRuntime.ts";
14	import type * as EffectAcpProtocol from "effect-acp/protocol";	14	import type * as EffectAcpProtocol from "effect-acp/protocol";
15		15
16	const __dirname = path.dirname(fileURLToPath(import.meta.url));	16	const __dirname = path.dirname(fileURLToPath(import.meta.url));
...	@@ -20,9 +20,9 @@ const mockAgentArgs = [mockAgentPath];	...	@@ -20,9 +20,9 @@ const mockAgentArgs = [mockAgentPath];
20		20
21	describe("AcpSessionRuntime", () => {	21	describe("AcpSessionRuntime", () => {
22	it.effect("merges custom initialize client capabilities into the ACP handshake", () => {	22	it.effect("merges custom initialize client capabilities into the ACP handshake", () => {
23	const requestEvents: Array<AcpSessionRequestLogEvent> = [];	23	const requestEvents: Array<AcpSessionRuntime.AcpSessionRequestLogEvent> = [];
24	return Effect.gen(function* () {	24	return Effect.gen(function* () {
25	const runtime = yield* AcpSessionRuntime;	25	const runtime = yield* AcpSessionRuntime.AcpSessionRuntime;
26	yield* runtime.start();	26	yield* runtime.start();
27		27
28	const initializeStarted = requestEvents.find(	28	const initializeStarted = requestEvents.find(
...	@@ -64,7 +64,7 @@ describe("AcpSessionRuntime", () => {	...	@@ -64,7 +64,7 @@ describe("AcpSessionRuntime", () => {
64		64
65	it.effect("starts a session, prompts, and emits normalized events against the mock agent", () =>	65	it.effect("starts a session, prompts, and emits normalized events against the mock agent", () =>
66	Effect.gen(function* () {	66	Effect.gen(function* () {
67	const runtime = yield* AcpSessionRuntime;	67	const runtime = yield* AcpSessionRuntime.AcpSessionRuntime;
68	const started = yield* runtime.start();	68	const started = yield* runtime.start();
69		69
70	expect(started.initializeResult).toMatchObject({ protocolVersion: 1 });	70	expect(started.initializeResult).toMatchObject({ protocolVersion: 1 });
...	@@ -115,7 +115,7 @@ describe("AcpSessionRuntime", () => {	...	@@ -115,7 +115,7 @@ describe("AcpSessionRuntime", () => {
115		115
116	it.effect("segments assistant text around ACP tool calls", () =>	116	it.effect("segments assistant text around ACP tool calls", () =>
117	Effect.gen(function* () {	117	Effect.gen(function* () {
118	const runtime = yield* AcpSessionRuntime;	118	const runtime = yield* AcpSessionRuntime.AcpSessionRuntime;
119	yield* runtime.start();	119	yield* runtime.start();
120		120
121	const promptResult = yield* runtime.prompt({	121	const promptResult = yield* runtime.prompt({
...	@@ -176,7 +176,7 @@ describe("AcpSessionRuntime", () => {	...	@@ -176,7 +176,7 @@ describe("AcpSessionRuntime", () => {
176		176
177	it.effect("suppresses generic placeholder tool updates until completion", () =>	177	it.effect("suppresses generic placeholder tool updates until completion", () =>
178	Effect.gen(function* () {	178	Effect.gen(function* () {
179	const runtime = yield* AcpSessionRuntime;	179	const runtime = yield* AcpSessionRuntime.AcpSessionRuntime;
180	yield* runtime.start();	180	yield* runtime.start();
181		181
182	const promptResult = yield* runtime.prompt({	182	const promptResult = yield* runtime.prompt({
...	@@ -213,9 +213,9 @@ describe("AcpSessionRuntime", () => {	...	@@ -213,9 +213,9 @@ describe("AcpSessionRuntime", () => {
213	);	213	);
214		214
215	it.effect("logs ACP requests from the shared runtime", () => {	215	it.effect("logs ACP requests from the shared runtime", () => {
216	const requestEvents: Array<AcpSessionRequestLogEvent> = [];	216	const requestEvents: Array<AcpSessionRuntime.AcpSessionRequestLogEvent> = [];
217	return Effect.gen(function* () {	217	return Effect.gen(function* () {
218	const runtime = yield* AcpSessionRuntime;	218	const runtime = yield* AcpSessionRuntime.AcpSessionRuntime;
219	yield* runtime.start();	219	yield* runtime.start();
220		220
221	yield* runtime.setModel("composer-2");	221	yield* runtime.setModel("composer-2");
...	@@ -265,9 +265,9 @@ describe("AcpSessionRuntime", () => {	...	@@ -265,9 +265,9 @@ describe("AcpSessionRuntime", () => {
265	});	265	});
266		266
267	it.effect("skips no-op session config writes when the requested value is already active", () => {	267	it.effect("skips no-op session config writes when the requested value is already active", () => {
268	const requestEvents: Array<AcpSessionRequestLogEvent> = [];	268	const requestEvents: Array<AcpSessionRuntime.AcpSessionRequestLogEvent> = [];
269	return Effect.gen(function* () {	269	return Effect.gen(function* () {
270	const runtime = yield* AcpSessionRuntime;	270	const runtime = yield* AcpSessionRuntime.AcpSessionRuntime;
271	yield* runtime.start();	271	yield* runtime.start();
272		272
273	yield* runtime.setConfigOption("model", "default");	273	yield* runtime.setConfigOption("model", "default");
...	@@ -302,7 +302,7 @@ describe("AcpSessionRuntime", () => {	...	@@ -302,7 +302,7 @@ describe("AcpSessionRuntime", () => {
302	it.effect("emits low-level ACP protocol logs for raw and decoded messages", () => {	302	it.effect("emits low-level ACP protocol logs for raw and decoded messages", () => {
303	const protocolEvents: Array<EffectAcpProtocol.AcpProtocolLogEvent> = [];	303	const protocolEvents: Array<EffectAcpProtocol.AcpProtocolLogEvent> = [];
304	return Effect.gen(function* () {	304	return Effect.gen(function* () {
305	const runtime = yield* AcpSessionRuntime;	305	const runtime = yield* AcpSessionRuntime.AcpSessionRuntime;
306	yield* runtime.start();	306	yield* runtime.start();
307		307
308	yield* runtime.prompt({	308	yield* runtime.prompt({
...	@@ -350,7 +350,7 @@ describe("AcpSessionRuntime", () => {	...	@@ -350,7 +350,7 @@ describe("AcpSessionRuntime", () => {
350	const tempDir = mkdtempSync(path.join(os.tmpdir(), "acp-runtime-"));	350	const tempDir = mkdtempSync(path.join(os.tmpdir(), "acp-runtime-"));
351	const requestLogPath = path.join(tempDir, "requests.ndjson");	351	const requestLogPath = path.join(tempDir, "requests.ndjson");
352	return Effect.gen(function* () {	352	return Effect.gen(function* () {
353	const runtime = yield* AcpSessionRuntime;	353	const runtime = yield* AcpSessionRuntime.AcpSessionRuntime;
354	yield* runtime.start();	354	yield* runtime.start();
355		355
356	const error = yield* runtime.setModel("composer-2[fast=false]").pipe(Effect.flip);	356	const error = yield* runtime.setModel("composer-2[fast=false]").pipe(Effect.flip);

...	@@ -9,12 +9,12 @@ import * as Effect from "effect/Effect";	...	@@ -9,12 +9,12 @@ import * as Effect from "effect/Effect";
9	import { describe, expect } from "vite-plus/test";	9	import { describe, expect } from "vite-plus/test";
10	import type * as EffectAcpSchema from "effect-acp/schema";	10	import type * as EffectAcpSchema from "effect-acp/schema";
11		11
12	import { AcpSessionRuntime } from "./AcpSessionRuntime.ts";	12	import * as AcpSessionRuntime from "./AcpSessionRuntime.ts";
13		13
14	describe.runIf(process.env.T3_CURSOR_ACP_PROBE === "1")("Cursor ACP CLI probe", () => {	14	describe.runIf(process.env.T3_CURSOR_ACP_PROBE === "1")("Cursor ACP CLI probe", () => {
15	it.effect("initialize and authenticate against real agent acp", () =>	15	it.effect("initialize and authenticate against real agent acp", () =>
16	Effect.gen(function* () {	16	Effect.gen(function* () {
17	const runtime = yield* AcpSessionRuntime;	17	const runtime = yield* AcpSessionRuntime.AcpSessionRuntime;
18	const started = yield* runtime.start();	18	const started = yield* runtime.start();
19	expect(started.initializeResult).toBeDefined();	19	expect(started.initializeResult).toBeDefined();
20	}).pipe(	20	}).pipe(
...	@@ -42,7 +42,7 @@ describe.runIf(process.env.T3_CURSOR_ACP_PROBE === "1")("Cursor ACP CLI probe",	...	@@ -42,7 +42,7 @@ describe.runIf(process.env.T3_CURSOR_ACP_PROBE === "1")("Cursor ACP CLI probe",
42		42
43	it.effect("session/new returns configOptions with a model selector", () =>	43	it.effect("session/new returns configOptions with a model selector", () =>
44	Effect.gen(function* () {	44	Effect.gen(function* () {
45	const runtime = yield* AcpSessionRuntime;	45	const runtime = yield* AcpSessionRuntime.AcpSessionRuntime;
46	const started = yield* runtime.start();	46	const started = yield* runtime.start();
47	const result = started.sessionSetupResult;	47	const result = started.sessionSetupResult;
48	// @effect-diagnostics-next-line preferSchemaOverJson:off	48	// @effect-diagnostics-next-line preferSchemaOverJson:off
...	@@ -97,7 +97,7 @@ describe.runIf(process.env.T3_CURSOR_ACP_PROBE === "1")("Cursor ACP CLI probe",	...	@@ -97,7 +97,7 @@ describe.runIf(process.env.T3_CURSOR_ACP_PROBE === "1")("Cursor ACP CLI probe",
97		97
98	it.effect("session/set_config_option switches the model in-session", () =>	98	it.effect("session/set_config_option switches the model in-session", () =>
99	Effect.gen(function* () {	99	Effect.gen(function* () {
100	const runtime = yield* AcpSessionRuntime;	100	const runtime = yield* AcpSessionRuntime.AcpSessionRuntime;
101	const started = yield* runtime.start();	101	const started = yield* runtime.start();
102	const newResult = started.sessionSetupResult;	102	const newResult = started.sessionSetupResult;
103		103

[codex] Standardize Effect protocol adapter services (#3201)