ryco-cli 0.1.3 → 0.1.5

package/dist/{CursorDriver-BVJV7yyE.cjs → CursorDriver-CYxn4_c1.cjs}

@@ -1,55 +1,57 @@
 #!/usr/bin/env node
 
-const require_bin = require('./bin.cjs');
-const require_makeManagedServerProvider = require('./makeManagedServerProvider-DVrBJ3h3.cjs');
-const require_ProviderDriver = require('./ProviderDriver-DJK4EOeA.cjs');
+const require_chunk = require("./chunk-jM1PLTSZ.cjs");
+const require_collectUint8StreamText = require("./collectUint8StreamText-DbCOJom3.cjs");
+const require_Metrics = require("./Metrics-DNOriWhP.cjs");
+const require_bin = require("./bin.cjs");
+const require_makeManagedServerProvider = require("./makeManagedServerProvider-C3cQUDkZ.cjs");
+const require_ProviderDriver = require("./ProviderDriver--rNeAi3B.cjs");
 let effect_Effect = require("effect/Effect");
-effect_Effect = require_bin.__toESM(effect_Effect);
+effect_Effect = require_chunk.__toESM(effect_Effect, 1);
 let effect_Layer = require("effect/Layer");
-effect_Layer = require_bin.__toESM(effect_Layer);
+effect_Layer = require_chunk.__toESM(effect_Layer, 1);
 let effect = require("effect");
 let effect_Schema = require("effect/Schema");
-effect_Schema = require_bin.__toESM(effect_Schema);
+effect_Schema = require_chunk.__toESM(effect_Schema, 1);
 let effect_unstable_rpc_Rpc = require("effect/unstable/rpc/Rpc");
-effect_unstable_rpc_Rpc = require_bin.__toESM(effect_unstable_rpc_Rpc);
+effect_unstable_rpc_Rpc = require_chunk.__toESM(effect_unstable_rpc_Rpc, 1);
 let effect_unstable_rpc_RpcGroup = require("effect/unstable/rpc/RpcGroup");
-effect_unstable_rpc_RpcGroup = require_bin.__toESM(effect_unstable_rpc_RpcGroup);
+effect_unstable_rpc_RpcGroup = require_chunk.__toESM(effect_unstable_rpc_RpcGroup, 1);
 let effect_unstable_http = require("effect/unstable/http");
 let node_os = require("node:os");
-node_os = require_bin.__toESM(node_os);
+node_os = require_chunk.__toESM(node_os, 1);
 let node_path = require("node:path");
-node_path = require_bin.__toESM(node_path);
-let effect_unstable_rpc = require("effect/unstable/rpc");
+node_path = require_chunk.__toESM(node_path, 1);
+require("effect/unstable/rpc");
 let effect_Context = require("effect/Context");
-effect_Context = require_bin.__toESM(effect_Context);
+effect_Context = require_chunk.__toESM(effect_Context, 1);
 let effect_Scope = require("effect/Scope");
-effect_Scope = require_bin.__toESM(effect_Scope);
+effect_Scope = require_chunk.__toESM(effect_Scope, 1);
 let effect_Stdio = require("effect/Stdio");
-effect_Stdio = require_bin.__toESM(effect_Stdio);
+effect_Stdio = require_chunk.__toESM(effect_Stdio, 1);
 let effect_unstable_process = require("effect/unstable/process");
 require("effect/Cause");
 let effect_Deferred = require("effect/Deferred");
-effect_Deferred = require_bin.__toESM(effect_Deferred);
+effect_Deferred = require_chunk.__toESM(effect_Deferred, 1);
 let effect_Queue = require("effect/Queue");
-effect_Queue = require_bin.__toESM(effect_Queue);
+effect_Queue = require_chunk.__toESM(effect_Queue, 1);
 let effect_Ref = require("effect/Ref");
-effect_Ref = require_bin.__toESM(effect_Ref);
+effect_Ref = require_chunk.__toESM(effect_Ref, 1);
 let effect_Stream = require("effect/Stream");
-effect_Stream = require_bin.__toESM(effect_Stream);
+effect_Stream = require_chunk.__toESM(effect_Stream, 1);
 let effect_SchemaIssue = require("effect/SchemaIssue");
-effect_SchemaIssue = require_bin.__toESM(effect_SchemaIssue);
+effect_SchemaIssue = require_chunk.__toESM(effect_SchemaIssue, 1);
 let effect_Sink = require("effect/Sink");
-effect_Sink = require_bin.__toESM(effect_Sink);
+effect_Sink = require_chunk.__toESM(effect_Sink, 1);
 let effect_unstable_rpc_RpcClient = require("effect/unstable/rpc/RpcClient");
-effect_unstable_rpc_RpcClient = require_bin.__toESM(effect_unstable_rpc_RpcClient);
+effect_unstable_rpc_RpcClient = require_chunk.__toESM(effect_unstable_rpc_RpcClient, 1);
 let effect_unstable_rpc_RpcServer = require("effect/unstable/rpc/RpcServer");
-effect_unstable_rpc_RpcServer = require_bin.__toESM(effect_unstable_rpc_RpcServer);
+effect_unstable_rpc_RpcServer = require_chunk.__toESM(effect_unstable_rpc_RpcServer, 1);
 let effect_unstable_rpc_RpcClientError = require("effect/unstable/rpc/RpcClientError");
-effect_unstable_rpc_RpcClientError = require_bin.__toESM(effect_unstable_rpc_RpcClientError);
+effect_unstable_rpc_RpcClientError = require_chunk.__toESM(effect_unstable_rpc_RpcClientError, 1);
 require("effect/unstable/rpc/RpcMessage");
 let effect_unstable_rpc_RpcSerialization = require("effect/unstable/rpc/RpcSerialization");
-effect_unstable_rpc_RpcSerialization = require_bin.__toESM(effect_unstable_rpc_RpcSerialization);
-
+effect_unstable_rpc_RpcSerialization = require_chunk.__toESM(effect_unstable_rpc_RpcSerialization, 1);
 //#region ../../packages/effect-acp/src/_generated/schema.gen.ts
 const AuthEnvVar = effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
@@ -620,11 +622,11 @@ const SessionModeState = effect_Schema.Struct({
 	availableModes: effect_Schema.Array(SessionMode).annotate({ description: "The set of modes that the Agent can operate in" }),
 	currentModeId: effect_Schema.String.annotate({ description: "Unique identifier for a Session Mode." })
 }).annotate({ description: "The set of modes and the one currently active." });
-const AgentAuthCapabilities = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	logout: effect_Schema.optionalKey(effect_Schema.Union([LogoutCapabilities, effect_Schema.Null]).annotate({ description: "Whether the agent supports the logout method.\n\nBy supplying `{}` it means that the agent supports the logout method." }))
 }).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nAuthentication-related capabilities supported by the agent." });
-const AgentCapabilities = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	auth: effect_Schema.optionalKey(effect_Schema.Struct({
 		_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
@@ -687,7 +689,7 @@ const AgentCapabilities = effect_Schema.Struct({
 		description: "Session capabilities supported by the agent.\n\nAs a baseline, all Agents **MUST** support `session/new`, `session/prompt`, `session/cancel`, and `session/update`.\n\nOptionally, they **MAY** support other session methods and notifications by specifying additional capabilities.\n\nNote: `session/load` is still handled by the top-level `load_session` capability. This will be unified in future versions of the protocol.\n\nSee protocol docs: [Session Capabilities](https://agentclientprotocol.com/protocol/initialization#session-capabilities)"
 	}))
 }).annotate({ description: "Capabilities supported by the agent.\n\nAdvertised during initialization to inform the client about\navailable features and content types.\n\nSee protocol docs: [Agent Capabilities](https://agentclientprotocol.com/protocol/initialization#agent-capabilities)" });
-const AgentNotification = effect_Schema.Struct({
+effect_Schema.Struct({
 	method: effect_Schema.String,
 	params: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Union([
 		effect_Schema.Struct({
@@ -926,7 +928,7 @@ const AgentNotification = effect_Schema.Struct({
 		})
 	]).annotate({ description: "All possible notifications that an agent can send to a client.\n\nThis enum is used internally for routing RPC notifications. You typically won't need\nto use this directly - use the notification methods on the [`Client`] trait instead.\n\nNotifications do not expect a response." }), effect_Schema.Null]))
 });
-const AgentRequest = effect_Schema.Struct({
+effect_Schema.Struct({
 	id: RequestId,
 	method: effect_Schema.String,
 	params: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Union([
@@ -1059,7 +1061,7 @@ const AgentRequest = effect_Schema.Struct({
 		})
 	]).annotate({ description: "All possible requests that an agent can send to a client.\n\nThis enum is used internally for routing RPC requests. You typically won't need\nto use this directly - instead, use the methods on the [`Client`] trait.\n\nThis enum encompasses all method calls from agent to client." }), effect_Schema.Null]))
 });
-const AgentResponse = effect_Schema.Union([effect_Schema.Struct({
+effect_Schema.Union([effect_Schema.Struct({
 	id: RequestId,
 	result: effect_Schema.Union([
 		effect_Schema.Struct({
@@ -1253,13 +1255,13 @@ const AgentResponse = effect_Schema.Union([effect_Schema.Struct({
 	error: Error$1,
 	id: RequestId
 }).annotate({ title: "Error" })]);
-const AudioContent = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	annotations: effect_Schema.optionalKey(effect_Schema.Union([Annotations, effect_Schema.Null])),
 	data: effect_Schema.String,
 	mimeType: effect_Schema.String
 }).annotate({ description: "Audio provided to or from an LLM." });
-const AuthCapabilities = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	terminal: effect_Schema.optionalKey(effect_Schema.Boolean.annotate({
 		description: "Whether the client supports `terminal` authentication methods.\n\nWhen `true`, the agent may include `terminal` entries in its authentication methods.",
@@ -1271,13 +1273,13 @@ const AuthenticateRequest = effect_Schema.Struct({
 	methodId: effect_Schema.String.annotate({ description: "The ID of the authentication method to use.\nMust be one of the methods advertised in the initialize response." })
 }).annotate({ description: "Request parameters for the authenticate method.\n\nSpecifies which authentication method to use." });
 const AuthenticateResponse = effect_Schema.Struct({ _meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])) }).annotate({ description: "Response to the `authenticate` method." });
-const AuthMethodAgent = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	description: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.String.annotate({ description: "Optional description providing more details about this authentication method." }), effect_Schema.Null])),
 	id: effect_Schema.String.annotate({ description: "Unique identifier for this authentication method." }),
 	name: effect_Schema.String.annotate({ description: "Human-readable name of the authentication method." })
 }).annotate({ description: "Agent handles authentication itself.\n\nThis is the default authentication method type." });
-const AuthMethodEnvVar = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	description: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.String.annotate({ description: "Optional description providing more details about this authentication method." }), effect_Schema.Null])),
 	id: effect_Schema.String.annotate({ description: "Unique identifier for this authentication method." }),
@@ -1285,7 +1287,7 @@ const AuthMethodEnvVar = effect_Schema.Struct({
 	name: effect_Schema.String.annotate({ description: "Human-readable name of the authentication method." }),
 	vars: effect_Schema.Array(AuthEnvVar).annotate({ description: "The environment variables the client should set." })
 }).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nEnvironment variable authentication method.\n\nThe user provides credentials that the client passes to the agent as environment variables." });
-const AuthMethodTerminal = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	args: effect_Schema.optionalKey(effect_Schema.Array(effect_Schema.String).annotate({ description: "Additional arguments to pass when running the agent binary for terminal auth." })),
 	description: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.String.annotate({ description: "Optional description providing more details about this authentication method." }), effect_Schema.Null])),
@@ -1293,26 +1295,26 @@ const AuthMethodTerminal = effect_Schema.Struct({
 	id: effect_Schema.String.annotate({ description: "Unique identifier for this authentication method." }),
 	name: effect_Schema.String.annotate({ description: "Human-readable name of the authentication method." })
 }).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nTerminal-based authentication method.\n\nThe client runs an interactive terminal for the user to authenticate via a TUI." });
-const AvailableCommandsUpdate = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	availableCommands: effect_Schema.Array(AvailableCommand).annotate({ description: "Commands the agent can execute" })
 }).annotate({ description: "Available commands are ready or have changed" });
-const BlobResourceContents = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	blob: effect_Schema.String,
 	mimeType: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.String, effect_Schema.Null])),
 	uri: effect_Schema.String
 }).annotate({ description: "Binary resource contents." });
-const BooleanPropertySchema = effect_Schema.Struct({
+effect_Schema.Struct({
 	default: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Boolean.annotate({ description: "Default value." }), effect_Schema.Null])),
 	description: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.String.annotate({ description: "Human-readable description." }), effect_Schema.Null])),
 	title: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.String.annotate({ description: "Optional title for the property." }), effect_Schema.Null]))
 }).annotate({ description: "Schema for boolean properties in an elicitation form." });
-const CancelNotification = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	sessionId: effect_Schema.String.annotate({ description: "A unique identifier for a conversation session between a client and agent.\n\nSessions maintain their own context, conversation history, and state,\nallowing multiple independent interactions with the same agent.\n\nSee protocol docs: [Session ID](https://agentclientprotocol.com/protocol/session-setup#session-id)" })
 }).annotate({ description: "Notification to cancel ongoing operations for a session.\n\nSee protocol docs: [Cancellation](https://agentclientprotocol.com/protocol/prompt-turn#cancellation)" });
-const CancelRequestNotification = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	requestId: effect_Schema.Union([
 		effect_Schema.Null.annotate({ title: "Null" }),
@@ -1323,7 +1325,7 @@ const CancelRequestNotification = effect_Schema.Struct({
 		effect_Schema.String.annotate({ title: "Str" })
 	]).annotate({ description: "JSON RPC Request Id\n\nAn identifier established by the Client that MUST contain a String, Number, or NULL value if included. If it is not included it is assumed to be a notification. The value SHOULD normally not be Null [1] and Numbers SHOULD NOT contain fractional parts [2]\n\nThe Server MUST reply with the same value in the Response object if included. This member is used to correlate the context between the two objects.\n\n[1] The use of Null as a value for the id member in a Request object is discouraged, because this specification uses a value of Null for Responses with an unknown id. Also, because JSON-RPC 1.0 uses an id value of Null for Notifications this could cause confusion in handling.\n\n[2] Fractional parts may be problematic, since many decimal fractions cannot be represented exactly as binary fractions." })
 }).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nNotification to cancel an ongoing request.\n\nSee protocol docs: [Cancellation](https://agentclientprotocol.com/protocol/cancellation)" });
-const ClientCapabilities = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	auth: effect_Schema.optionalKey(effect_Schema.Struct({
 		_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
@@ -1358,7 +1360,7 @@ const ClientCapabilities = effect_Schema.Struct({
 		default: false
 	}))
 }).annotate({ description: "Capabilities supported by the client.\n\nAdvertised during initialization to inform the agent about\navailable features and methods.\n\nSee protocol docs: [Client Capabilities](https://agentclientprotocol.com/protocol/initialization#client-capabilities)" });
-const ClientNotification = effect_Schema.Struct({
+effect_Schema.Struct({
 	method: effect_Schema.String,
 	params: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Union([effect_Schema.Struct({
 		_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
@@ -1371,7 +1373,7 @@ const ClientNotification = effect_Schema.Struct({
 		description: "Allows the Agent to send an arbitrary notification that is not part of the ACP spec.\nExtension notifications provide a way to send one-way messages for custom functionality\nwhile maintaining protocol compatibility.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)"
 	})]).annotate({ description: "All possible notifications that a client can send to an agent.\n\nThis enum is used internally for routing RPC notifications. You typically won't need\nto use this directly - use the notification methods on the [`Agent`] trait instead.\n\nNotifications do not expect a response." }), effect_Schema.Null]))
 });
-const ClientRequest = effect_Schema.Struct({
+effect_Schema.Struct({
 	id: RequestId,
 	method: effect_Schema.String,
 	params: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Union([
@@ -1541,7 +1543,7 @@ const ClientRequest = effect_Schema.Struct({
 		})
 	]).annotate({ description: "All possible requests that a client can send to an agent.\n\nThis enum is used internally for routing RPC requests. You typically won't need\nto use this directly - instead, use the methods on the [`Agent`] trait.\n\nThis enum encompasses all method calls from client to agent." }), effect_Schema.Null]))
 });
-const ClientResponse = effect_Schema.Union([effect_Schema.Struct({
+effect_Schema.Union([effect_Schema.Struct({
 	id: RequestId,
 	result: effect_Schema.Union([
 		effect_Schema.Struct({ _meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])) }).annotate({
@@ -1629,11 +1631,11 @@ const CloseSessionRequest = effect_Schema.Struct({
 	sessionId: effect_Schema.String.annotate({ description: "A unique identifier for a conversation session between a client and agent.\n\nSessions maintain their own context, conversation history, and state,\nallowing multiple independent interactions with the same agent.\n\nSee protocol docs: [Session ID](https://agentclientprotocol.com/protocol/session-setup#session-id)" })
 }).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nRequest parameters for closing an active session.\n\nIf supported, the agent **must** cancel any ongoing work related to the session\n(treat it as if `session/cancel` was called) and then free up any resources\nassociated with the session.\n\nOnly available if the Agent supports the `session.close` capability." });
 const CloseSessionResponse = effect_Schema.Struct({ _meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])) }).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nResponse from closing a session." });
-const ConfigOptionUpdate = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	configOptions: effect_Schema.Array(SessionConfigOption).annotate({ description: "The full set of configuration options and their current values." })
 }).annotate({ description: "Session configuration options have been updated." });
-const Content = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	content: effect_Schema.Union([
 		effect_Schema.Struct({
@@ -1676,7 +1678,7 @@ const Content = effect_Schema.Struct({
 		}).annotate({ description: "The contents of a resource, embedded into a prompt or tool call result." })
 	], { mode: "oneOf" }).annotate({ description: "Content blocks represent displayable information in the Agent Client Protocol.\n\nThey provide a structured way to handle various types of user-facing content—whether\nit's text from language models, images for analysis, or embedded resources for context.\n\nContent blocks appear in:\n- User prompts sent via `session/prompt`\n- Language model output streamed through `session/update` notifications\n- Progress updates and results from tool calls\n\nThis structure is compatible with the Model Context Protocol (MCP), enabling\nagents to seamlessly forward content from MCP tool outputs without transformation.\n\nSee protocol docs: [Content](https://agentclientprotocol.com/protocol/content)" })
 }).annotate({ description: "Standard content block (text, images, resources)." });
-const ContentChunk = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	content: effect_Schema.Union([
 		effect_Schema.Struct({
@@ -1736,18 +1738,18 @@ const CreateTerminalResponse = effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	terminalId: effect_Schema.String.annotate({ description: "The unique identifier for the created terminal." })
 }).annotate({ description: "Response containing the ID of the created terminal." });
-const CurrentModeUpdate = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	currentModeId: effect_Schema.String.annotate({ description: "Unique identifier for a Session Mode." })
 }).annotate({ description: "The current mode of the session has changed\n\nSee protocol docs: [Session Modes](https://agentclientprotocol.com/protocol/session-modes)" });
-const Diff = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	newText: effect_Schema.String.annotate({ description: "The new content after modification." }),
 	oldText: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.String.annotate({ description: "The original content (None for new files)." }), effect_Schema.Null])),
 	path: effect_Schema.String.annotate({ description: "The file path being modified." })
 }).annotate({ description: "A diff representing file modifications.\n\nShows changes to files in a format suitable for display in the client UI.\n\nSee protocol docs: [Content](https://agentclientprotocol.com/protocol/tool-calls#content)" });
-const ElicitationAcceptAction = effect_Schema.Struct({ content: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, ElicitationContentValue).annotate({ description: "The user-provided content, if any, as an object matching the requested schema." }), effect_Schema.Null])) }).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nThe user accepted the elicitation and provided content." });
-const ElicitationAction = effect_Schema.Union([
+effect_Schema.Struct({ content: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, ElicitationContentValue).annotate({ description: "The user-provided content, if any, as an object matching the requested schema." }), effect_Schema.Null])) }).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nThe user accepted the elicitation and provided content." });
+effect_Schema.Union([
 	effect_Schema.Struct({
 		action: effect_Schema.Literal("accept"),
 		content: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, ElicitationContentValue).annotate({ description: "The user-provided content, if any, as an object matching the requested schema." }), effect_Schema.Null]))
@@ -1759,7 +1761,7 @@ const ElicitationCompleteNotification = effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	elicitationId: effect_Schema.String.annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nUnique identifier for an elicitation." })
 }).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nNotification sent by the agent when a URL-based elicitation is complete." });
-const ElicitationFormMode = effect_Schema.Struct({ requestedSchema: effect_Schema.Struct({
+effect_Schema.Struct({ requestedSchema: effect_Schema.Struct({
 	description: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.String.annotate({ description: "Optional description of what this schema represents." }), effect_Schema.Null])),
 	properties: effect_Schema.optionalKey(effect_Schema.Record(effect_Schema.String, ElicitationPropertySchema).annotate({
 		description: "Property definitions (must be primitive types).",
@@ -1772,7 +1774,7 @@ const ElicitationFormMode = effect_Schema.Struct({ requestedSchema: effect_Schem
 		default: "object"
 	}))
 }).annotate({ description: "Type-safe elicitation schema for requesting structured user input.\n\nThis represents a JSON Schema object with primitive-typed properties,\nas required by the elicitation specification." }) }).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nForm-based elicitation mode where the client renders a form from the provided schema." });
-const ElicitationId = effect_Schema.String.annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nUnique identifier for an elicitation." });
+effect_Schema.String.annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nUnique identifier for an elicitation." });
 const ElicitationRequest = effect_Schema.Union([effect_Schema.Struct({
 	mode: effect_Schema.Literal("form"),
 	requestedSchema: effect_Schema.Struct({
@@ -1813,7 +1815,7 @@ const ElicitationResponse = effect_Schema.Struct({
 		effect_Schema.Struct({ action: effect_Schema.Literal("cancel") }).annotate({ description: "The elicitation was cancelled." })
 	], { mode: "oneOf" }).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nThe user's action in response to an elicitation." })
 }).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nResponse from the client to an elicitation request." });
-const ElicitationSchema = effect_Schema.Struct({
+effect_Schema.Struct({
 	description: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.String.annotate({ description: "Optional description of what this schema represents." }), effect_Schema.Null])),
 	properties: effect_Schema.optionalKey(effect_Schema.Record(effect_Schema.String, ElicitationPropertySchema).annotate({
 		description: "Property definitions (must be primitive types).",
@@ -1826,16 +1828,16 @@ const ElicitationSchema = effect_Schema.Struct({
 		default: "object"
 	}))
 }).annotate({ description: "Type-safe elicitation schema for requesting structured user input.\n\nThis represents a JSON Schema object with primitive-typed properties,\nas required by the elicitation specification." });
-const ElicitationSchemaType = effect_Schema.Literal("object").annotate({ description: "Type discriminator for elicitation schemas." });
-const ElicitationStringType = effect_Schema.Literal("string").annotate({ description: "Items definition for untitled multi-select enum properties." });
-const ElicitationUrlMode = effect_Schema.Struct({
+effect_Schema.Literal("object").annotate({ description: "Type discriminator for elicitation schemas." });
+effect_Schema.Literal("string").annotate({ description: "Items definition for untitled multi-select enum properties." });
+effect_Schema.Struct({
 	elicitationId: effect_Schema.String.annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nUnique identifier for an elicitation." }),
 	url: effect_Schema.String.annotate({
 		description: "The URL to direct the user to.",
 		format: "uri"
 	})
 }).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nURL-based elicitation mode where the client directs the user to a URL." });
-const EmbeddedResource = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	annotations: effect_Schema.optionalKey(effect_Schema.Union([Annotations, effect_Schema.Null])),
 	resource: EmbeddedResourceResource
@@ -1892,10 +1894,10 @@ const ErrorCode = effect_Schema.Union([
 		format: "int32"
 	}).check(effect_Schema.isInt())
 ]).annotate({ description: "Predefined error codes for common JSON-RPC and ACP-specific errors.\n\nThese codes follow the JSON-RPC 2.0 specification for standard errors\nand use the reserved range (-32000 to -32099) for protocol-specific errors." });
-const ExtNotification = effect_Schema.Unknown.annotate({ description: "Allows the Agent to send an arbitrary notification that is not part of the ACP spec.\nExtension notifications provide a way to send one-way messages for custom functionality\nwhile maintaining protocol compatibility.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" });
-const ExtRequest = effect_Schema.Unknown.annotate({ description: "Allows for sending an arbitrary request that is not part of the ACP spec.\nExtension methods provide a way to add custom functionality while maintaining\nprotocol compatibility.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" });
-const ExtResponse = effect_Schema.Unknown.annotate({ description: "Allows for sending an arbitrary response to an [`ExtRequest`] that is not part of the ACP spec.\nExtension methods provide a way to add custom functionality while maintaining\nprotocol compatibility.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" });
-const FileSystemCapabilities = effect_Schema.Struct({
+effect_Schema.Unknown.annotate({ description: "Allows the Agent to send an arbitrary notification that is not part of the ACP spec.\nExtension notifications provide a way to send one-way messages for custom functionality\nwhile maintaining protocol compatibility.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" });
+effect_Schema.Unknown.annotate({ description: "Allows for sending an arbitrary request that is not part of the ACP spec.\nExtension methods provide a way to add custom functionality while maintaining\nprotocol compatibility.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" });
+effect_Schema.Unknown.annotate({ description: "Allows for sending an arbitrary response to an [`ExtRequest`] that is not part of the ACP spec.\nExtension methods provide a way to add custom functionality while maintaining\nprotocol compatibility.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" });
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	readTextFile: effect_Schema.optionalKey(effect_Schema.Boolean.annotate({
 		description: "Whether the Client supports `fs/read_text_file` requests.",
@@ -1919,7 +1921,7 @@ const ForkSessionResponse = effect_Schema.Struct({
 	modes: effect_Schema.optionalKey(effect_Schema.Union([SessionModeState, effect_Schema.Null]).annotate({ description: "Initial mode state if supported by the Agent\n\nSee protocol docs: [Session Modes](https://agentclientprotocol.com/protocol/session-modes)" })),
 	sessionId: effect_Schema.String.annotate({ description: "A unique identifier for a conversation session between a client and agent.\n\nSessions maintain their own context, conversation history, and state,\nallowing multiple independent interactions with the same agent.\n\nSee protocol docs: [Session ID](https://agentclientprotocol.com/protocol/session-setup#session-id)" })
 }).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nResponse from forking an existing session." });
-const ImageContent = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	annotations: effect_Schema.optionalKey(effect_Schema.Union([Annotations, effect_Schema.Null])),
 	data: effect_Schema.String,
@@ -2070,7 +2072,7 @@ const InitializeResponse = effect_Schema.Struct({
 		format: "uint16"
 	}).check(effect_Schema.isInt()).check(effect_Schema.isGreaterThanOrEqualTo(0)).check(effect_Schema.isLessThanOrEqualTo(65535))
 }).annotate({ description: "Response to the `initialize` method.\n\nContains the negotiated protocol version and agent capabilities.\n\nSee protocol docs: [Initialization](https://agentclientprotocol.com/protocol/initialization)" });
-const IntegerPropertySchema = effect_Schema.Struct({
+effect_Schema.Struct({
 	default: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Number.annotate({
 		description: "Default value.",
 		format: "int64"
@@ -2116,7 +2118,7 @@ const LoadSessionResponse = effect_Schema.Struct({
 }).annotate({ description: "Response from loading an existing session." });
 const LogoutRequest = effect_Schema.Struct({ _meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])) }).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nRequest parameters for the logout method.\n\nTerminates the current authenticated session." });
 const LogoutResponse = effect_Schema.Struct({ _meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])) }).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nResponse to the `logout` method." });
-const McpCapabilities = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	http: effect_Schema.optionalKey(effect_Schema.Boolean.annotate({
 		description: "Agent supports [`McpServer::Http`].",
@@ -2127,27 +2129,27 @@ const McpCapabilities = effect_Schema.Struct({
 		default: false
 	}))
 }).annotate({ description: "MCP capabilities supported by the agent" });
-const McpServerHttp = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	headers: effect_Schema.Array(HttpHeader).annotate({ description: "HTTP headers to set when making requests to the MCP server." }),
 	name: effect_Schema.String.annotate({ description: "Human-readable name identifying this MCP server." }),
 	url: effect_Schema.String.annotate({ description: "URL to the MCP server." })
 }).annotate({ description: "HTTP transport configuration for MCP." });
-const McpServerSse = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	headers: effect_Schema.Array(HttpHeader).annotate({ description: "HTTP headers to set when making requests to the MCP server." }),
 	name: effect_Schema.String.annotate({ description: "Human-readable name identifying this MCP server." }),
 	url: effect_Schema.String.annotate({ description: "URL to the MCP server." })
 }).annotate({ description: "SSE transport configuration for MCP." });
-const McpServerStdio = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	args: effect_Schema.Array(effect_Schema.String).annotate({ description: "Command-line arguments to pass to the MCP server." }),
 	command: effect_Schema.String.annotate({ description: "Path to the MCP server executable." }),
 	env: effect_Schema.Array(EnvVariable).annotate({ description: "Environment variables to set when launching the MCP server." }),
 	name: effect_Schema.String.annotate({ description: "Human-readable name identifying this MCP server." })
 }).annotate({ description: "Stdio transport configuration for MCP." });
-const ModelId = effect_Schema.String.annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nA unique identifier for a model." });
-const MultiSelectItems = effect_Schema.Union([effect_Schema.Struct({
+effect_Schema.String.annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nA unique identifier for a model." });
+effect_Schema.Union([effect_Schema.Struct({
 	enum: effect_Schema.Array(effect_Schema.String).annotate({ description: "Allowed enum values." }),
 	type: effect_Schema.Literal("string").annotate({ description: "Items definition for untitled multi-select enum properties." })
 }).annotate({
@@ -2157,7 +2159,7 @@ const MultiSelectItems = effect_Schema.Union([effect_Schema.Struct({
 	title: "Titled",
 	description: "Items definition for titled multi-select enum properties."
 })]).annotate({ description: "Items for a multi-select (array) property schema." });
-const MultiSelectPropertySchema = effect_Schema.Struct({
+effect_Schema.Struct({
 	default: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Array(effect_Schema.String).annotate({ description: "Default selected values." }), effect_Schema.Null])),
 	description: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.String.annotate({ description: "Human-readable description." }), effect_Schema.Null])),
 	items: effect_Schema.Union([effect_Schema.Struct({
@@ -2192,7 +2194,7 @@ const NewSessionResponse = effect_Schema.Struct({
 	modes: effect_Schema.optionalKey(effect_Schema.Union([SessionModeState, effect_Schema.Null]).annotate({ description: "Initial mode state if supported by the Agent\n\nSee protocol docs: [Session Modes](https://agentclientprotocol.com/protocol/session-modes)" })),
 	sessionId: effect_Schema.String.annotate({ description: "A unique identifier for a conversation session between a client and agent.\n\nSessions maintain their own context, conversation history, and state,\nallowing multiple independent interactions with the same agent.\n\nSee protocol docs: [Session ID](https://agentclientprotocol.com/protocol/session-setup#session-id)" })
 }).annotate({ description: "Response from creating a new session.\n\nSee protocol docs: [Creating a Session](https://agentclientprotocol.com/protocol/session-setup#creating-a-session)" });
-const NumberPropertySchema = effect_Schema.Struct({
+effect_Schema.Struct({
 	default: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Number.annotate({
 		description: "Default value.",
 		format: "double"
@@ -2208,28 +2210,28 @@ const NumberPropertySchema = effect_Schema.Struct({
 	}).check(effect_Schema.isFinite()), effect_Schema.Null])),
 	title: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.String.annotate({ description: "Optional title for the property." }), effect_Schema.Null]))
 }).annotate({ description: "Schema for number (floating-point) properties in an elicitation form." });
-const PermissionOptionId = effect_Schema.String.annotate({ description: "Unique identifier for a permission option." });
-const PermissionOptionKind = effect_Schema.Literals([
+effect_Schema.String.annotate({ description: "Unique identifier for a permission option." });
+effect_Schema.Literals([
 	"allow_once",
 	"allow_always",
 	"reject_once",
 	"reject_always"
 ]).annotate({ description: "The type of permission option being presented to the user.\n\nHelps clients choose appropriate icons and UI treatment." });
-const Plan = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	entries: effect_Schema.Array(PlanEntry).annotate({ description: "The list of tasks to be accomplished.\n\nWhen updating a plan, the agent must send a complete list of all entries\nwith their current status. The client replaces the entire plan with each update." })
 }).annotate({ description: "An execution plan for accomplishing complex tasks.\n\nPlans consist of multiple entries representing individual tasks or goals.\nAgents report plans to clients to provide visibility into their execution strategy.\nPlans can evolve during execution as the agent discovers new requirements or completes tasks.\n\nSee protocol docs: [Agent Plan](https://agentclientprotocol.com/protocol/agent-plan)" });
-const PlanEntryPriority = effect_Schema.Literals([
+effect_Schema.Literals([
 	"high",
 	"medium",
 	"low"
 ]).annotate({ description: "Priority levels for plan entries.\n\nUsed to indicate the relative importance or urgency of different\ntasks in the execution plan.\nSee protocol docs: [Plan Entries](https://agentclientprotocol.com/protocol/agent-plan#plan-entries)" });
-const PlanEntryStatus = effect_Schema.Literals([
+effect_Schema.Literals([
 	"pending",
 	"in_progress",
 	"completed"
 ]).annotate({ description: "Status of a plan entry in the execution flow.\n\nTracks the lifecycle of each task from planning through completion.\nSee protocol docs: [Plan Entries](https://agentclientprotocol.com/protocol/agent-plan#plan-entries)" });
-const PromptCapabilities = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	audio: effect_Schema.optionalKey(effect_Schema.Boolean.annotate({
 		description: "Agent supports [`ContentBlock::Audio`].",
@@ -2262,7 +2264,7 @@ const PromptResponse = effect_Schema.Struct({
 	usage: effect_Schema.optionalKey(effect_Schema.Union([Usage, effect_Schema.Null]).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nToken usage for this turn (optional)." })),
 	userMessageId: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.String.annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nThe acknowledged user message ID.\n\nIf the client provided a `messageId` in the [`PromptRequest`], the agent echoes it here\nto confirm it was recorded. If the client did not provide one, the agent MAY assign one\nand return it here. Absence of this field indicates the agent did not record a message ID." }), effect_Schema.Null]))
 }).annotate({ description: "Response from processing a user prompt.\n\nSee protocol docs: [Check for Completion](https://agentclientprotocol.com/protocol/prompt-turn#4-check-for-completion)" });
-const ProtocolVersion = effect_Schema.Number.annotate({
+effect_Schema.Number.annotate({
 	description: "Protocol version identifier.\n\nThis version is only bumped for breaking changes.\nNon-breaking changes should be introduced via capabilities.",
 	format: "uint16"
 }).check(effect_Schema.isInt()).check(effect_Schema.isGreaterThanOrEqualTo(0)).check(effect_Schema.isLessThanOrEqualTo(65535));
@@ -2289,7 +2291,7 @@ const ReleaseTerminalRequest = effect_Schema.Struct({
 	terminalId: effect_Schema.String.annotate({ description: "The ID of the terminal to release." })
 }).annotate({ description: "Request to release a terminal and free its resources." });
 const ReleaseTerminalResponse = effect_Schema.Struct({ _meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])) }).annotate({ description: "Response to terminal/release method" });
-const RequestPermissionOutcome = effect_Schema.Union([effect_Schema.Struct({ outcome: effect_Schema.Literal("cancelled") }).annotate({ description: "The prompt turn was cancelled before the user responded.\n\nWhen a client sends a `session/cancel` notification to cancel an ongoing\nprompt turn, it MUST respond to all pending `session/request_permission`\nrequests with this `Cancelled` outcome.\n\nSee protocol docs: [Cancellation](https://agentclientprotocol.com/protocol/prompt-turn#cancellation)" }), effect_Schema.Struct({
+effect_Schema.Union([effect_Schema.Struct({ outcome: effect_Schema.Literal("cancelled") }).annotate({ description: "The prompt turn was cancelled before the user responded.\n\nWhen a client sends a `session/cancel` notification to cancel an ongoing\nprompt turn, it MUST respond to all pending `session/request_permission`\nrequests with this `Cancelled` outcome.\n\nSee protocol docs: [Cancellation](https://agentclientprotocol.com/protocol/prompt-turn#cancellation)" }), effect_Schema.Struct({
 	outcome: effect_Schema.Literal("selected"),
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	optionId: effect_Schema.String.annotate({ description: "Unique identifier for a permission option." })
@@ -2318,7 +2320,7 @@ const RequestPermissionResponse = effect_Schema.Struct({
 		optionId: effect_Schema.String.annotate({ description: "Unique identifier for a permission option." })
 	}).annotate({ description: "The user selected one of the provided options." })], { mode: "oneOf" }).annotate({ description: "The outcome of a permission request." })
 }).annotate({ description: "Response to a permission request." });
-const ResourceLink = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	annotations: effect_Schema.optionalKey(effect_Schema.Union([Annotations, effect_Schema.Null])),
 	description: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.String, effect_Schema.Null])),
@@ -2340,21 +2342,21 @@ const ResumeSessionResponse = effect_Schema.Struct({
 	models: effect_Schema.optionalKey(effect_Schema.Union([SessionModelState, effect_Schema.Null]).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nInitial model state if supported by the Agent" })),
 	modes: effect_Schema.optionalKey(effect_Schema.Union([SessionModeState, effect_Schema.Null]).annotate({ description: "Initial mode state if supported by the Agent\n\nSee protocol docs: [Session Modes](https://agentclientprotocol.com/protocol/session-modes)" }))
 }).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nResponse from resuming an existing session." });
-const SelectedPermissionOutcome = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	optionId: effect_Schema.String.annotate({ description: "Unique identifier for a permission option." })
 }).annotate({ description: "The user selected one of the provided options." });
-const SessionCapabilities = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	close: effect_Schema.optionalKey(effect_Schema.Union([SessionCloseCapabilities, effect_Schema.Null]).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nWhether the agent supports `session/close`." })),
 	fork: effect_Schema.optionalKey(effect_Schema.Union([SessionForkCapabilities, effect_Schema.Null]).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nWhether the agent supports `session/fork`." })),
 	list: effect_Schema.optionalKey(effect_Schema.Union([SessionListCapabilities, effect_Schema.Null]).annotate({ description: "Whether the agent supports `session/list`." })),
 	resume: effect_Schema.optionalKey(effect_Schema.Union([SessionResumeCapabilities, effect_Schema.Null]).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nWhether the agent supports `session/resume`." }))
 }).annotate({ description: "Session capabilities supported by the agent.\n\nAs a baseline, all Agents **MUST** support `session/new`, `session/prompt`, `session/cancel`, and `session/update`.\n\nOptionally, they **MAY** support other session methods and notifications by specifying additional capabilities.\n\nNote: `session/load` is still handled by the top-level `load_session` capability. This will be unified in future versions of the protocol.\n\nSee protocol docs: [Session Capabilities](https://agentclientprotocol.com/protocol/initialization#session-capabilities)" });
-const SessionConfigBoolean = effect_Schema.Struct({ currentValue: effect_Schema.Boolean.annotate({ description: "The current value of the boolean option." }) }).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nA boolean on/off toggle session configuration option payload." });
-const SessionConfigGroupId = effect_Schema.String.annotate({ description: "Unique identifier for a session configuration option value group." });
-const SessionConfigId = effect_Schema.String.annotate({ description: "Unique identifier for a session configuration option." });
-const SessionConfigSelect = effect_Schema.Struct({
+effect_Schema.Struct({ currentValue: effect_Schema.Boolean.annotate({ description: "The current value of the boolean option." }) }).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nA boolean on/off toggle session configuration option payload." });
+effect_Schema.String.annotate({ description: "Unique identifier for a session configuration option value group." });
+effect_Schema.String.annotate({ description: "Unique identifier for a session configuration option." });
+effect_Schema.Struct({
 	currentValue: effect_Schema.String.annotate({ description: "Unique identifier for a session configuration option value." }),
 	options: effect_Schema.Union([effect_Schema.Array(SessionConfigSelectOption).annotate({
 		title: "Ungrouped",
@@ -2364,16 +2366,16 @@ const SessionConfigSelect = effect_Schema.Struct({
 		description: "A list of options grouped under headers."
 	})]).annotate({ description: "Possible values for a session configuration option." })
 }).annotate({ description: "A single-value selector (dropdown) session configuration option payload." });
-const SessionConfigSelectOptions = effect_Schema.Union([effect_Schema.Array(SessionConfigSelectOption).annotate({
+effect_Schema.Union([effect_Schema.Array(SessionConfigSelectOption).annotate({
 	title: "Ungrouped",
 	description: "A flat list of options with no grouping."
 }), effect_Schema.Array(SessionConfigSelectGroup).annotate({
 	title: "Grouped",
 	description: "A list of options grouped under headers."
 })]).annotate({ description: "Possible values for a session configuration option." });
-const SessionConfigValueId = effect_Schema.String.annotate({ description: "Unique identifier for a session configuration option value." });
-const SessionId = effect_Schema.String.annotate({ description: "A unique identifier for a conversation session between a client and agent.\n\nSessions maintain their own context, conversation history, and state,\nallowing multiple independent interactions with the same agent.\n\nSee protocol docs: [Session ID](https://agentclientprotocol.com/protocol/session-setup#session-id)" });
-const SessionInfoUpdate = effect_Schema.Struct({
+effect_Schema.String.annotate({ description: "Unique identifier for a session configuration option value." });
+effect_Schema.String.annotate({ description: "A unique identifier for a conversation session between a client and agent.\n\nSessions maintain their own context, conversation history, and state,\nallowing multiple independent interactions with the same agent.\n\nSee protocol docs: [Session ID](https://agentclientprotocol.com/protocol/session-setup#session-id)" });
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	title: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.String.annotate({ description: "Human-readable title for the session. Set to null to clear." }), effect_Schema.Null])),
 	updatedAt: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.String.annotate({ description: "ISO 8601 timestamp of last activity. Set to null to clear." }), effect_Schema.Null]))
@@ -2598,7 +2600,7 @@ const SessionNotification = effect_Schema.Struct({
 		}).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nContext window and cost update for a session." })
 	], { mode: "oneOf" }).annotate({ description: "Different types of updates that can be sent during session processing.\n\nThese updates provide real-time feedback about the agent's progress.\n\nSee protocol docs: [Agent Reports Output](https://agentclientprotocol.com/protocol/prompt-turn#3-agent-reports-output)" })
 }).annotate({ description: "Notification containing a session update from the agent.\n\nUsed to stream real-time progress and results during prompt processing.\n\nSee protocol docs: [Agent Reports Output](https://agentclientprotocol.com/protocol/prompt-turn#3-agent-reports-output)" });
-const SessionUpdate = effect_Schema.Union([
+effect_Schema.Union([
 	effect_Schema.Struct({
 		sessionUpdate: effect_Schema.Literal("user_message_chunk"),
 		_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
@@ -2839,20 +2841,20 @@ const SetSessionModelRequest = effect_Schema.Struct({
 	sessionId: effect_Schema.String.annotate({ description: "A unique identifier for a conversation session between a client and agent.\n\nSessions maintain their own context, conversation history, and state,\nallowing multiple independent interactions with the same agent.\n\nSee protocol docs: [Session ID](https://agentclientprotocol.com/protocol/session-setup#session-id)" })
 }).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nRequest parameters for setting a session model." });
 const SetSessionModelResponse = effect_Schema.Struct({ _meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])) }).annotate({ description: "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nResponse to `session/set_model` method." });
-const SetSessionModeRequest = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	modeId: effect_Schema.String.annotate({ description: "Unique identifier for a Session Mode." }),
 	sessionId: effect_Schema.String.annotate({ description: "A unique identifier for a conversation session between a client and agent.\n\nSessions maintain their own context, conversation history, and state,\nallowing multiple independent interactions with the same agent.\n\nSee protocol docs: [Session ID](https://agentclientprotocol.com/protocol/session-setup#session-id)" })
 }).annotate({ description: "Request parameters for setting a session mode." });
-const SetSessionModeResponse = effect_Schema.Struct({ _meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])) }).annotate({ description: "Response to `session/set_mode` method." });
-const StopReason = effect_Schema.Literals([
+effect_Schema.Struct({ _meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])) }).annotate({ description: "Response to `session/set_mode` method." });
+effect_Schema.Literals([
 	"end_turn",
 	"max_tokens",
 	"max_turn_requests",
 	"refusal",
 	"cancelled"
 ]).annotate({ description: "Reasons why an agent stops processing a prompt turn.\n\nSee protocol docs: [Stop Reasons](https://agentclientprotocol.com/protocol/prompt-turn#stop-reasons)" });
-const StringPropertySchema = effect_Schema.Struct({
+effect_Schema.Struct({
 	default: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.String.annotate({ description: "Default value." }), effect_Schema.Null])),
 	description: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.String.annotate({ description: "Human-readable description." }), effect_Schema.Null])),
 	enum: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Array(effect_Schema.String).annotate({ description: "Enum values for untitled single-select enums." }), effect_Schema.Null])),
@@ -2869,7 +2871,7 @@ const StringPropertySchema = effect_Schema.Struct({
 	pattern: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.String.annotate({ description: "Pattern the string must match." }), effect_Schema.Null])),
 	title: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.String.annotate({ description: "Optional title for the property." }), effect_Schema.Null]))
 }).annotate({ description: "Schema for string properties in an elicitation form.\n\nWhen `enum` or `oneOf` is set, this represents a single-select enum\nwith `\"type\": \"string\"`." });
-const Terminal = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	terminalId: effect_Schema.String
 }).annotate({ description: "Embed a terminal created with `terminal/create` by its id.\n\nThe terminal must be added before calling `terminal/release`.\n\nSee protocol docs: [Terminal](https://agentclientprotocol.com/protocol/terminals)" });
@@ -2884,19 +2886,19 @@ const TerminalOutputResponse = effect_Schema.Struct({
 	output: effect_Schema.String.annotate({ description: "The terminal output captured so far." }),
 	truncated: effect_Schema.Boolean.annotate({ description: "Whether the output was truncated due to byte limits." })
 }).annotate({ description: "Response containing the terminal output and exit status." });
-const TextContent = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	annotations: effect_Schema.optionalKey(effect_Schema.Union([Annotations, effect_Schema.Null])),
 	text: effect_Schema.String
 }).annotate({ description: "Text provided to or from an LLM." });
-const TextResourceContents = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	mimeType: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.String, effect_Schema.Null])),
 	text: effect_Schema.String,
 	uri: effect_Schema.String
 }).annotate({ description: "Text-based resource contents." });
-const TitledMultiSelectItems = effect_Schema.Struct({ anyOf: effect_Schema.Array(EnumOption).annotate({ description: "Titled enum options." }) }).annotate({ description: "Items definition for titled multi-select enum properties." });
-const ToolCall = effect_Schema.Struct({
+effect_Schema.Struct({ anyOf: effect_Schema.Array(EnumOption).annotate({ description: "Titled enum options." }) }).annotate({ description: "Items definition for titled multi-select enum properties." });
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	content: effect_Schema.optionalKey(effect_Schema.Array(ToolCallContent).annotate({ description: "Content produced by the tool call." })),
 	kind: effect_Schema.optionalKey(effect_Schema.Literals([
@@ -2923,8 +2925,8 @@ const ToolCall = effect_Schema.Struct({
 	title: effect_Schema.String.annotate({ description: "Human-readable title describing what the tool is doing." }),
 	toolCallId: effect_Schema.String.annotate({ description: "Unique identifier for a tool call within a session." })
 }).annotate({ description: "Represents a tool call that the language model has requested.\n\nTool calls are actions that the agent executes on behalf of the language model,\nsuch as reading files, executing code, or fetching data from external sources.\n\nSee protocol docs: [Tool Calls](https://agentclientprotocol.com/protocol/tool-calls)" });
-const ToolCallId = effect_Schema.String.annotate({ description: "Unique identifier for a tool call within a session." });
-const ToolCallUpdate = effect_Schema.Struct({
+effect_Schema.String.annotate({ description: "Unique identifier for a tool call within a session." });
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	content: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Array(ToolCallContent).annotate({ description: "Replace the content collection." }), effect_Schema.Null])),
 	kind: effect_Schema.optionalKey(effect_Schema.Union([ToolKind, effect_Schema.Null]).annotate({ description: "Update the tool kind." })),
@@ -2935,15 +2937,15 @@ const ToolCallUpdate = effect_Schema.Struct({
 	title: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.String.annotate({ description: "Update the human-readable title." }), effect_Schema.Null])),
 	toolCallId: effect_Schema.String.annotate({ description: "Unique identifier for a tool call within a session." })
 }).annotate({ description: "An update to an existing tool call.\n\nUsed to report progress and results as tools execute. All fields except\nthe tool call ID are optional - only changed fields need to be included.\n\nSee protocol docs: [Updating](https://agentclientprotocol.com/protocol/tool-calls#updating)" });
-const UnstructuredCommandInput = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	hint: effect_Schema.String.annotate({ description: "A hint to display when the input hasn't been provided yet" })
 }).annotate({ description: "All text that was typed after the command name is provided as input." });
-const UntitledMultiSelectItems = effect_Schema.Struct({
+effect_Schema.Struct({
 	enum: effect_Schema.Array(effect_Schema.String).annotate({ description: "Allowed enum values." }),
 	type: effect_Schema.Literal("string").annotate({ description: "Items definition for untitled multi-select enum properties." })
 }).annotate({ description: "Items definition for untitled multi-select enum properties." });
-const UsageUpdate = effect_Schema.Struct({
+effect_Schema.Struct({
 	_meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])),
 	cost: effect_Schema.optionalKey(effect_Schema.Union([Cost, effect_Schema.Null]).annotate({ description: "Cumulative session cost (optional)." })),
 	size: effect_Schema.Number.annotate({
@@ -2975,7 +2977,6 @@ const WriteTextFileRequest = effect_Schema.Struct({
 	sessionId: effect_Schema.String.annotate({ description: "A unique identifier for a conversation session between a client and agent.\n\nSessions maintain their own context, conversation history, and state,\nallowing multiple independent interactions with the same agent.\n\nSee protocol docs: [Session ID](https://agentclientprotocol.com/protocol/session-setup#session-id)" })
 }).annotate({ description: "Request to write content to a text file.\n\nOnly available if the client supports the `fs.writeTextFile` capability." });
 const WriteTextFileResponse = effect_Schema.Struct({ _meta: effect_Schema.optionalKey(effect_Schema.Union([effect_Schema.Record(effect_Schema.String, effect_Schema.Unknown).annotate({ description: "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)" }), effect_Schema.Null])) }).annotate({ description: "Response to `fs/write_text_file`" });
-
 //#endregion
 //#region ../../packages/effect-acp/src/errors.ts
 var AcpSpawnError = class extends effect_Schema.TaggedErrorClass()("AcpSpawnError", {
@@ -3084,7 +3085,6 @@ const AcpError = effect_Schema.Union([
 	AcpProtocolParseError,
 	AcpTransportError
 ]);
-
 //#endregion
 //#region ../../packages/effect-acp/src/_generated/meta.gen.ts
 const AGENT_METHODS = {
@@ -3116,7 +3116,6 @@ const CLIENT_METHODS = {
 	terminal_release: "terminal/release",
 	terminal_wait_for_exit: "terminal/wait_for_exit"
 };
-
 //#endregion
 //#region ../../packages/effect-acp/src/protocol.ts
 const decodeSessionUpdate = effect_Schema.decodeUnknownEffect(SessionNotification);
@@ -3363,7 +3362,6 @@ function toRpcClientError(error) {
 		cause: error
 	}) });
 }
-
 //#endregion
 //#region ../../packages/effect-acp/src/rpc.ts
 const InitializeRpc = effect_unstable_rpc_Rpc.make(AGENT_METHODS.initialize, {
@@ -3473,7 +3471,6 @@ const KillTerminalRpc = effect_unstable_rpc_Rpc.make(CLIENT_METHODS.terminal_kil
 });
 const AgentRpcs = effect_unstable_rpc_RpcGroup.make(InitializeRpc, AuthenticateRpc, LogoutRpc, NewSessionRpc, LoadSessionRpc, ListSessionsRpc, ForkSessionRpc, ResumeSessionRpc, CloseSessionRpc, PromptRpc, SetSessionModelRpc, SetSessionConfigOptionRpc);
 const ClientRpcs = effect_unstable_rpc_RpcGroup.make(ReadTextFileRpc, WriteTextFileRpc, RequestPermissionRpc, ElicitationRpc, CreateTerminalRpc, TerminalOutputRpc, ReleaseTerminalRpc, WaitForTerminalExitRpc, KillTerminalRpc);
-
 //#endregion
 //#region ../../packages/effect-acp/src/_internal/shared.ts
 const formatSchemaIssue = effect_SchemaIssue.makeFormatterDefault();
@@ -3494,10 +3491,9 @@ function decodeExtNotificationRegistration(method, payload, handler) {
 		cause: error
 	})), effect_Effect.flatMap((decoded) => handler(decoded)));
 }
-const encoder$1 = new TextEncoder();
-const JsonRpcId = effect_Schema.Union([effect_Schema.Number, effect_Schema.String]);
-const JsonRpcHeaders = effect_Schema.Array(effect_Schema.Unknown);
-
+new TextEncoder();
+effect_Schema.Union([effect_Schema.Number, effect_Schema.String]);
+effect_Schema.Array(effect_Schema.Unknown);
 //#endregion
 //#region ../../packages/effect-acp/src/_internal/stdio.ts
 const encoder = new TextEncoder();
@@ -3507,7 +3503,7 @@ const makeChildStdio = (handle) => effect_Stdio.make({
 	stdout: () => effect_Sink.mapInput(handle.stdin, (chunk) => typeof chunk === "string" ? encoder.encode(chunk) : chunk),
 	stderr: () => effect_Sink.drain
 });
-const makeInMemoryStdio = effect_Effect.fn("makeInMemoryStdio")(function* () {
+effect_Effect.fn("makeInMemoryStdio")(function* () {
 	const input = yield* effect_Queue.unbounded();
 	const output = yield* effect_Queue.unbounded();
 	const decoder = new TextDecoder();
@@ -3529,7 +3525,6 @@ const makeTerminationError = (handle) => effect_Effect.match(handle.exitCode, {
 	}),
 	onSuccess: (code) => new AcpProcessExitedError({ code })
 });
-
 //#endregion
 //#region ../../packages/effect-acp/src/client.ts
 var AcpClient = class extends effect_Context.Service()("effect-acp/AcpClient") {};
@@ -3693,7 +3688,6 @@ const layerChildProcess = (handle, options = {}) => {
 	const terminationError = makeTerminationError(handle);
 	return effect_Layer.effect(AcpClient, make(stdio, options, terminationError));
 };
-
 //#endregion
 //#region ../../packages/shared/src/toolActivity.ts
 function asRecord(value) {
@@ -3848,7 +3842,6 @@ function deriveToolActivityPresentation(input) {
 	};
 	return { summary: title ?? fallbackSummary };
 }
-
 //#endregion
 //#region src/provider/acp/AcpRuntimeModel.ts
 function isRecord$1(value) {
@@ -4097,10 +4090,9 @@ function parseSessionUpdateEvent(params) {
 		events
 	};
 }
-
 //#endregion
 //#region src/provider/acp/AcpSessionRuntime.ts
-var AcpSessionRuntime = class AcpSessionRuntime extends effect.Context.Service()("s3/provider/acp/AcpSessionRuntime") {
+var AcpSessionRuntime = class AcpSessionRuntime extends effect.Context.Service()("ryco/provider/acp/AcpSessionRuntime") {
 	static layer(options) {
 		return effect.Layer.effect(AcpSessionRuntime, makeAcpSessionRuntime(options));
 	}
@@ -4427,10 +4419,85 @@ const closeActiveAssistantSegment = ({ queue, assistantSegmentRef }) => effect.R
 		itemId: current.activeItemId
 	}, { nextSegmentIndex: current.nextSegmentIndex }];
 }).pipe(effect.Effect.flatMap((event) => event ? effect.Queue.offer(queue, event) : effect.Effect.void));
-
+//#endregion
+//#region src/provider/acp/CursorAcpExtension.ts
+const CursorAskQuestionOption = effect.Schema.Struct({
+	id: effect.Schema.String,
+	label: effect.Schema.String
+});
+const CursorAskQuestion = effect.Schema.Struct({
+	id: effect.Schema.String,
+	prompt: effect.Schema.String,
+	options: effect.Schema.Array(CursorAskQuestionOption),
+	allowMultiple: effect.Schema.optional(effect.Schema.Boolean)
+});
+const CursorAskQuestionRequest = effect.Schema.Struct({
+	toolCallId: effect.Schema.String,
+	title: effect.Schema.optional(effect.Schema.String),
+	questions: effect.Schema.Array(CursorAskQuestion)
+});
+const CursorTodoStatus = effect.Schema.String;
+const CursorTodo = effect.Schema.Struct({
+	id: effect.Schema.optional(effect.Schema.String),
+	content: effect.Schema.optional(effect.Schema.String),
+	title: effect.Schema.optional(effect.Schema.String),
+	status: effect.Schema.optional(CursorTodoStatus)
+});
+const CursorPlanPhase = effect.Schema.Struct({
+	name: effect.Schema.String,
+	todos: effect.Schema.Array(CursorTodo)
+});
+const CursorCreatePlanRequest = effect.Schema.Struct({
+	toolCallId: effect.Schema.String,
+	name: effect.Schema.optional(effect.Schema.String),
+	overview: effect.Schema.optional(effect.Schema.String),
+	plan: effect.Schema.String,
+	todos: effect.Schema.Array(CursorTodo),
+	isProject: effect.Schema.optional(effect.Schema.Boolean),
+	phases: effect.Schema.optional(effect.Schema.Array(CursorPlanPhase))
+});
+const CursorUpdateTodosRequest = effect.Schema.Struct({
+	toolCallId: effect.Schema.String,
+	todos: effect.Schema.Array(CursorTodo),
+	merge: effect.Schema.Boolean
+});
+const CursorAvailableModel = effect.Schema.Struct({
+	value: effect.Schema.String,
+	name: effect.Schema.String,
+	configOptions: effect.Schema.optional(effect.Schema.Array(SessionConfigOption))
+});
+const CursorListAvailableModelsResponse = effect.Schema.Struct({ models: effect.Schema.Array(CursorAvailableModel) });
+function extractAskQuestions(params) {
+	return params.questions.map((question) => ({
+		id: question.id,
+		header: "Question",
+		question: question.prompt,
+		multiSelect: question.allowMultiple === true,
+		options: question.options.length > 0 ? question.options.map((option) => ({
+			label: option.label,
+			description: option.label
+		})) : [{
+			label: "OK",
+			description: "Continue"
+		}]
+	}));
+}
+function extractPlanMarkdown(params) {
+	return params.plan || "# Plan\n\n(Cursor did not supply plan text.)";
+}
+function extractTodosAsPlan(params) {
+	return { plan: params.todos.flatMap((todo) => {
+		const step = todo.content?.trim() ?? todo.title?.trim() ?? "";
+		if (step === "") return [];
+		return [{
+			step,
+			status: todo.status === "completed" ? "completed" : todo.status === "in_progress" || todo.status === "inProgress" ? "inProgress" : "pending"
+		}];
+	}) };
+}
 //#endregion
 //#region src/provider/Layers/CursorProvider.ts
-const PROVIDER$1 = require_bin.ProviderDriverKind.make("cursor");
+const PROVIDER$1 = require_collectUint8StreamText.ProviderDriverKind.make("cursor");
 const CURSOR_PRESENTATION = {
 	displayName: "Cursor",
 	badgeLabel: "Early Access",
@@ -4438,8 +4505,6 @@ const CURSOR_PRESENTATION = {
 };
 const EMPTY_CAPABILITIES = require_bin.createModelCapabilities({ optionDescriptors: [] });
 const CURSOR_ACP_MODEL_DISCOVERY_TIMEOUT_MS = 15e3;
-const CURSOR_ACP_MODEL_CAPABILITY_TIMEOUT = "4 seconds";
-const CURSOR_ACP_MODEL_DISCOVERY_CONCURRENCY = 4;
 const CURSOR_PARAMETERIZED_MODEL_PICKER_MIN_VERSION_DATE = 20260408;
 const CURSOR_PARAMETERIZED_MODEL_PICKER_CAPABILITIES = { _meta: { parameterizedModelPicker: true } };
 function buildInitialCursorProviderSnapshot(cursorSettings) {
@@ -4495,9 +4560,6 @@ function normalizeCursorReasoningValue(value) {
 		default: return;
 	}
 }
-function findCursorModelConfigOption(configOptions) {
-	return configOptions.find((option) => option.category === "model");
-}
 function getCursorConfigOptionCategory(option) {
 	return option.category?.trim().toLowerCase() ?? "";
 }
@@ -4609,21 +4671,17 @@ function buildCursorDiscoveredModels(discoveredModels) {
 		}];
 	});
 }
-function hasCursorModelCapabilities(model) {
-	return (model.capabilities?.optionDescriptors?.length ?? 0) > 0;
-}
-function buildCursorDiscoveredModelsFromConfigOptions(configOptions) {
-	if (!configOptions || configOptions.length === 0) return [];
-	const modelOption = findCursorModelConfigOption(configOptions);
-	const modelChoices = flattenSessionConfigSelectOptions(modelOption);
-	if (!modelOption || modelChoices.length === 0) return [];
-	const currentModelValue = modelOption.type === "select" ? modelOption.currentValue?.trim() || void 0 : void 0;
-	const currentModelCapabilities = buildCursorCapabilitiesFromConfigOptions(configOptions);
-	return buildCursorDiscoveredModels(modelChoices.map((modelChoice) => ({
-		slug: modelChoice.value.trim(),
-		name: modelChoice.name.trim(),
-		capabilities: currentModelValue === modelChoice.value.trim() ? currentModelCapabilities : EMPTY_CAPABILITIES
-	})));
+function buildCursorDiscoveredModelsFromAvailableModelsResponse(response) {
+	return buildCursorDiscoveredModels(response.models.flatMap((model) => {
+		const slug = model.value.trim();
+		const name = model.name.trim();
+		if (!slug || !name) return [];
+		return [{
+			slug,
+			name,
+			capabilities: buildCursorCapabilitiesFromConfigOptions(model.configOptions ?? [])
+		}];
+	}));
 }
 const makeCursorAcpProbeRuntime = (cursorSettings, environment = process.env) => effect.Effect.gen(function* () {
 	const spawner = yield* effect_unstable_process.ChildProcessSpawner.ChildProcessSpawner;
@@ -4706,49 +4764,11 @@ function resolveCursorAcpConfigUpdates(configOptions, selections) {
 	}
 	return updates;
 }
-const discoverCursorModelsViaAcp = (cursorSettings, environment = process.env) => withCursorAcpProbeRuntime(cursorSettings, (acp) => effect.Effect.map(acp.start(), (started) => buildCursorDiscoveredModelsFromConfigOptions(started.sessionSetupResult.configOptions ?? [])), environment);
-const discoverCursorModelCapabilitiesViaAcp = (cursorSettings, existingModels, environment = process.env) => withCursorAcpProbeRuntime(cursorSettings, (acp) => effect.Effect.gen(function* () {
-	const initialConfigOptions = (yield* acp.start()).sessionSetupResult.configOptions ?? [];
-	const modelOption = findCursorModelConfigOption(initialConfigOptions);
-	const modelChoices = flattenSessionConfigSelectOptions(modelOption);
-	if (!modelOption || modelChoices.length === 0) return [];
-	const currentModelValue = modelOption.type === "select" ? modelOption.currentValue?.trim() || void 0 : void 0;
-	const capabilitiesBySlug = /* @__PURE__ */ new Map();
-	if (currentModelValue) capabilitiesBySlug.set(currentModelValue, buildCursorCapabilitiesFromConfigOptions(initialConfigOptions));
-	const targetModelSlugs = new Set(existingModels.filter((model) => !model.isCustom && !hasCursorModelCapabilities(model)).map((model) => model.slug));
-	if (targetModelSlugs.size === 0) return buildCursorDiscoveredModels(modelChoices.map((modelChoice) => ({
-		slug: modelChoice.value.trim(),
-		name: modelChoice.name.trim(),
-		capabilities: capabilitiesBySlug.get(modelChoice.value.trim()) ?? EMPTY_CAPABILITIES
-	})));
-	const probedCapabilities = yield* effect.Effect.forEach(modelChoices, (modelChoice) => {
-		const modelSlug = modelChoice.value.trim();
-		if (!modelSlug || !targetModelSlugs.has(modelSlug) || capabilitiesBySlug.has(modelSlug)) return effect.Effect.void.pipe(effect.Effect.as(void 0));
-		return withCursorAcpProbeRuntime(cursorSettings, (probeAcp) => effect.Effect.gen(function* () {
-			const probeConfigOptions = (yield* probeAcp.start()).sessionSetupResult.configOptions ?? [];
-			const probeModelOption = findCursorModelConfigOption(probeConfigOptions);
-			const probeCurrentModelValue = probeModelOption?.type === "select" ? probeModelOption.currentValue?.trim() || void 0 : void 0;
-			yield* effect.Effect.annotateCurrentSpan({
-				"cursor.acp.model.value": modelSlug,
-				"cursor.acp.model.currentValue": probeCurrentModelValue,
-				"cursor.acp.config_option_id": probeModelOption?.id ?? modelOption.id
-			});
-			return [modelSlug, buildCursorCapabilitiesFromConfigOptions(probeCurrentModelValue === modelSlug ? probeConfigOptions : yield* probeAcp.setConfigOption(probeModelOption?.id ?? modelOption.id, modelSlug).pipe(effect.Effect.map((response) => response.configOptions ?? probeConfigOptions)))];
-		}), environment).pipe(effect.Effect.timeout(CURSOR_ACP_MODEL_CAPABILITY_TIMEOUT), effect.Effect.retry({ times: 3 }), effect.Effect.withSpan("cursor-acp-model-capability-probe"), effect.Effect.catchCause((cause) => effect.Effect.logWarning("Cursor ACP capability probe failed", {
-			modelSlug,
-			cause: effect.Cause.pretty(cause)
-		})));
-	}, { concurrency: CURSOR_ACP_MODEL_DISCOVERY_CONCURRENCY });
-	for (const entry of probedCapabilities) {
-		if (!entry) continue;
-		capabilitiesBySlug.set(entry[0], entry[1]);
-	}
-	return buildCursorDiscoveredModels(modelChoices.map((modelChoice) => ({
-		slug: modelChoice.value.trim(),
-		name: modelChoice.name.trim(),
-		capabilities: capabilitiesBySlug.get(modelChoice.value.trim()) ?? EMPTY_CAPABILITIES
-	})));
-}).pipe(effect.Effect.withSpan("cursor-acp-model-capability-discovery", {})), environment);
+const discoverCursorModelsViaAcp = (cursorSettings, environment = process.env) => withCursorAcpProbeRuntime(cursorSettings, (acp) => effect.Effect.gen(function* () {
+	yield* acp.start();
+	const response = yield* acp.request("cursor/list_available_models", {});
+	return buildCursorDiscoveredModelsFromAvailableModelsResponse(yield* effect.Schema.decodeUnknownEffect(CursorListAvailableModelsResponse)(response));
+}), environment);
 function getCursorFallbackModels(cursorSettings) {
 	return require_bin.providerModelsFromSettings([], PROVIDER$1, cursorSettings.customModels, EMPTY_CAPABILITIES);
 }
@@ -5073,37 +5093,20 @@ const checkCursorProviderStatus = effect.Effect.fn("checkCursorProviderStatus")(
 		...discoveryWarning ? { discoveryWarning } : {}
 	});
 });
-function hasUncapturedCursorModels(snapshot) {
-	return snapshot.models.some((model) => !model.isCustom && !hasCursorModelCapabilities(model));
-}
 /**
-* Background capability enrichment for a Cursor snapshot.
+* Background maintenance enrichment for a Cursor snapshot.
 *
 * Used by `CursorDriver` as the `makeManagedServerProvider.enrichSnapshot`
-* hook: runs the slow ACP per-model capability probe, and republishes the
-* snapshot through `publishSnapshot` when new capabilities arrive. Skips
-* the probe when the provider is disabled, unauthenticated, or has no
-* uncaptured models. Keeps `EMPTY_CAPABILITIES` and the `PROVIDER` literal
-* private to this module.
+* hook: republishes update/version advisory metadata without performing any
+* model or capability discovery. Cursor model data comes from
+* `cursor/list_available_models` during provider status checks.
 */
 const enrichCursorSnapshot = (input) => {
 	const { settings, snapshot, publishSnapshot } = input;
 	const stampIdentity = input.stampIdentity ?? ((value) => value);
-	return require_bin.enrichProviderSnapshotWithVersionAdvisory(snapshot, input.maintenanceCapabilities).pipe(effect.Effect.provideService(effect_unstable_http.HttpClient.HttpClient, input.httpClient), effect.Effect.flatMap((enrichedSnapshot) => publishSnapshot(stampIdentity(enrichedSnapshot)).pipe(effect.Effect.as(enrichedSnapshot))), effect.Effect.catchCause((cause) => effect.Effect.logWarning("Cursor version advisory enrichment failed", { cause: effect.Cause.pretty(cause) }).pipe(effect.Effect.as(snapshot)))).pipe(effect.Effect.flatMap((baseSnapshot) => {
-		if (!settings.enabled || baseSnapshot.auth.status === "unauthenticated" || !hasUncapturedCursorModels(baseSnapshot)) return effect.Effect.void;
-		return discoverCursorModelCapabilitiesViaAcp(settings, baseSnapshot.models, input.environment).pipe(effect.Effect.flatMap((discoveredModels) => {
-			if (discoveredModels.length === 0) return effect.Effect.void;
-			return publishSnapshot(stampIdentity({
-				...baseSnapshot,
-				models: require_bin.providerModelsFromSettings(discoveredModels, PROVIDER$1, settings.customModels, EMPTY_CAPABILITIES)
-			}));
-		}), effect.Effect.catchCause((cause) => effect.Effect.logWarning("Cursor ACP background capability enrichment failed", {
-			models: baseSnapshot.models.map((model) => model.slug),
-			cause: effect.Cause.pretty(cause)
-		}).pipe(effect.Effect.asVoid)));
-	}));
+	if (!settings.enabled || snapshot.auth.status === "unauthenticated") return effect.Effect.void;
+	return require_bin.enrichProviderSnapshotWithVersionAdvisory(snapshot, input.maintenanceCapabilities).pipe(effect.Effect.provideService(effect_unstable_http.HttpClient.HttpClient, input.httpClient), effect.Effect.flatMap((enrichedSnapshot) => publishSnapshot(stampIdentity(enrichedSnapshot)).pipe(effect.Effect.asVoid)), effect.Effect.catchCause((cause) => effect.Effect.logWarning("Cursor version advisory enrichment failed", { cause: effect.Cause.pretty(cause) }).pipe(effect.Effect.asVoid)));
 };
-
 //#endregion
 //#region src/provider/acp/CursorAcpSupport.ts
 function buildCursorAcpSpawnInput(cursorSettings, cwd, environment) {
@@ -5137,12 +5140,11 @@ function applyCursorAcpModelSelection(input) {
 		})));
 	});
 }
-
 //#endregion
 //#region src/textGeneration/CursorTextGeneration.ts
 const CURSOR_TIMEOUT_MS = 18e4;
 function mapCursorAcpError(operation, detail, cause) {
-	return new require_bin.TextGenerationError({
+	return new require_collectUint8StreamText.TextGenerationError({
 		operation,
 		detail,
 		...cause !== void 0 ? { cause } : {}
@@ -5190,18 +5192,18 @@ const makeCursorTextGeneration = effect.Effect.fn("makeCursorTextGeneration")(fu
 				text: prompt
 			}] });
 		}).pipe(effect.Effect.timeoutOption(CURSOR_TIMEOUT_MS), effect.Effect.flatMap(effect.Option.match({
-			onNone: () => effect.Effect.fail(new require_bin.TextGenerationError({
+			onNone: () => effect.Effect.fail(new require_collectUint8StreamText.TextGenerationError({
 				operation,
 				detail: "Cursor Agent request timed out."
 			})),
 			onSome: (value) => effect.Effect.succeed(value)
 		})), effect.Effect.mapError((cause) => isTextGenerationError(cause) ? cause : mapCursorAcpError(operation, "Cursor ACP request failed.", cause)));
 		const rawResult = (yield* effect.Ref.get(outputRef)).trim();
-		if (!rawResult) return yield* new require_bin.TextGenerationError({
+		if (!rawResult) return yield* new require_collectUint8StreamText.TextGenerationError({
 			operation,
 			detail: promptResult.stopReason === "cancelled" ? "Cursor ACP request was cancelled." : "Cursor Agent returned empty output."
 		});
-		return yield* effect.Schema.decodeEffect(effect.Schema.fromJsonString(outputSchemaJson))(require_makeManagedServerProvider.extractJsonObject(rawResult)).pipe(effect.Effect.catchTag("SchemaError", (cause) => effect.Effect.fail(new require_bin.TextGenerationError({
+		return yield* effect.Schema.decodeEffect(effect.Schema.fromJsonString(outputSchemaJson))(require_makeManagedServerProvider.extractJsonObject(rawResult)).pipe(effect.Effect.catchTag("SchemaError", (cause) => effect.Effect.fail(new require_collectUint8StreamText.TextGenerationError({
 			operation,
 			detail: "Cursor Agent returned invalid structured output.",
 			cause
@@ -5225,7 +5227,7 @@ const makeCursorTextGeneration = effect.Effect.fn("makeCursorTextGeneration")(fu
 			return {
 				subject: require_makeManagedServerProvider.sanitizeCommitSubject(generated.subject),
 				body: generated.body.trim(),
-				..."branch" in generated && typeof generated.branch === "string" ? { branch: require_bin.sanitizeFeatureBranchName(generated.branch) } : {}
+				..."branch" in generated && typeof generated.branch === "string" ? { branch: require_Metrics.sanitizeFeatureBranchName(generated.branch) } : {}
 			};
 		}),
 		generatePrContent: effect.Effect.fn("CursorTextGeneration.generatePrContent")(function* (input) {
@@ -5253,7 +5255,7 @@ const makeCursorTextGeneration = effect.Effect.fn("makeCursorTextGeneration")(fu
 				message: input.message,
 				attachments: input.attachments
 			});
-			return { branch: require_bin.sanitizeBranchFragment((yield* runCursorJson({
+			return { branch: require_Metrics.sanitizeBranchFragment((yield* runCursorJson({
 				operation: "generateBranchName",
 				cwd: input.cwd,
 				prompt,
@@ -5305,7 +5307,6 @@ const makeCursorTextGeneration = effect.Effect.fn("makeCursorTextGeneration")(fu
 		})
 	};
 });
-
 //#endregion
 //#region src/provider/acp/AcpAdapterSupport.ts
 function mapAcpToAdapterError(provider, threadId, method, error) {
@@ -5334,7 +5335,6 @@ function acpPermissionOutcome(decision) {
 		default: return "reject-once";
 	}
 }
-
 //#endregion
 //#region src/provider/acp/AcpCoreRuntimeEvents.ts
 function canonicalRequestTypeFromAcpKind(kind) {
@@ -5424,7 +5424,7 @@ function makeAcpToolCallEvent(input) {
 		provider: input.provider,
 		threadId: input.threadId,
 		turnId: input.turnId,
-		itemId: require_bin.RuntimeItemId.make(input.toolCall.toolCallId),
+		itemId: require_collectUint8StreamText.RuntimeItemId.make(input.toolCall.toolCallId),
 		payload: {
 			itemType: canonicalItemTypeFromAcpToolKind(input.toolCall.kind),
 			...runtimeStatus ? { status: runtimeStatus } : {},
@@ -5446,7 +5446,7 @@ function makeAcpAssistantItemEvent(input) {
 		provider: input.provider,
 		threadId: input.threadId,
 		turnId: input.turnId,
-		itemId: require_bin.RuntimeItemId.make(input.itemId),
+		itemId: require_collectUint8StreamText.RuntimeItemId.make(input.itemId),
 		payload: {
 			itemType: "assistant_message",
 			status: input.lifecycle === "item.completed" ? "completed" : "inProgress"
@@ -5460,7 +5460,7 @@ function makeAcpContentDeltaEvent(input) {
 		provider: input.provider,
 		threadId: input.threadId,
 		turnId: input.turnId,
-		...input.itemId ? { itemId: require_bin.RuntimeItemId.make(input.itemId) } : {},
+		...input.itemId ? { itemId: require_collectUint8StreamText.RuntimeItemId.make(input.itemId) } : {},
 		payload: {
 			streamKind: "assistant_text",
 			delta: input.text
@@ -5472,7 +5472,6 @@ function makeAcpContentDeltaEvent(input) {
 		}
 	};
 }
-
 //#endregion
 //#region src/provider/acp/AcpNativeLogging.ts
 function writeNativeAcpLog(input) {
@@ -5523,78 +5522,6 @@ function makeAcpNativeLoggers(input) {
 		} } : {}
 	};
 }
-
-//#endregion
-//#region src/provider/acp/CursorAcpExtension.ts
-const CursorAskQuestionOption = effect.Schema.Struct({
-	id: effect.Schema.String,
-	label: effect.Schema.String
-});
-const CursorAskQuestion = effect.Schema.Struct({
-	id: effect.Schema.String,
-	prompt: effect.Schema.String,
-	options: effect.Schema.Array(CursorAskQuestionOption),
-	allowMultiple: effect.Schema.optional(effect.Schema.Boolean)
-});
-const CursorAskQuestionRequest = effect.Schema.Struct({
-	toolCallId: effect.Schema.String,
-	title: effect.Schema.optional(effect.Schema.String),
-	questions: effect.Schema.Array(CursorAskQuestion)
-});
-const CursorTodoStatus = effect.Schema.String;
-const CursorTodo = effect.Schema.Struct({
-	id: effect.Schema.optional(effect.Schema.String),
-	content: effect.Schema.optional(effect.Schema.String),
-	title: effect.Schema.optional(effect.Schema.String),
-	status: effect.Schema.optional(CursorTodoStatus)
-});
-const CursorPlanPhase = effect.Schema.Struct({
-	name: effect.Schema.String,
-	todos: effect.Schema.Array(CursorTodo)
-});
-const CursorCreatePlanRequest = effect.Schema.Struct({
-	toolCallId: effect.Schema.String,
-	name: effect.Schema.optional(effect.Schema.String),
-	overview: effect.Schema.optional(effect.Schema.String),
-	plan: effect.Schema.String,
-	todos: effect.Schema.Array(CursorTodo),
-	isProject: effect.Schema.optional(effect.Schema.Boolean),
-	phases: effect.Schema.optional(effect.Schema.Array(CursorPlanPhase))
-});
-const CursorUpdateTodosRequest = effect.Schema.Struct({
-	toolCallId: effect.Schema.String,
-	todos: effect.Schema.Array(CursorTodo),
-	merge: effect.Schema.Boolean
-});
-function extractAskQuestions(params) {
-	return params.questions.map((question) => ({
-		id: question.id,
-		header: "Question",
-		question: question.prompt,
-		multiSelect: question.allowMultiple === true,
-		options: question.options.length > 0 ? question.options.map((option) => ({
-			label: option.label,
-			description: option.label
-		})) : [{
-			label: "OK",
-			description: "Continue"
-		}]
-	}));
-}
-function extractPlanMarkdown(params) {
-	return params.plan || "# Plan\n\n(Cursor did not supply plan text.)";
-}
-function extractTodosAsPlan(params) {
-	return { plan: params.todos.flatMap((todo) => {
-		const step = todo.content?.trim() ?? todo.title?.trim() ?? "";
-		if (step === "") return [];
-		return [{
-			step,
-			status: todo.status === "completed" ? "completed" : todo.status === "in_progress" || todo.status === "inProgress" ? "inProgress" : "pending"
-		}];
-	}) };
-}
-
 //#endregion
 //#region src/provider/Layers/CursorAdapter.ts
 /**
@@ -5602,7 +5529,7 @@ function extractTodosAsPlan(params) {
 *
 * @module CursorAdapterLive
 */
-const PROVIDER = require_bin.ProviderDriverKind.make("cursor");
+const PROVIDER = require_collectUint8StreamText.ProviderDriverKind.make("cursor");
 const CURSOR_RESUME_VERSION = 1;
 const ACP_PLAN_MODE_ALIASES = ["plan", "architect"];
 const ACP_IMPLEMENT_MODE_ALIASES = [
@@ -5693,17 +5620,17 @@ function selectAutoApprovedPermissionOption(request) {
 }
 function makeCursorAdapter(cursorSettings, options) {
 	return effect.Effect.gen(function* () {
-		const boundInstanceId = options?.instanceId ?? require_bin.ProviderInstanceId.make("cursor");
+		const boundInstanceId = options?.instanceId ?? require_collectUint8StreamText.ProviderInstanceId.make("cursor");
 		const fileSystem = yield* effect.FileSystem.FileSystem;
 		const childProcessSpawner = yield* effect_unstable_process.ChildProcessSpawner.ChildProcessSpawner;
-		const serverConfig = yield* effect.Effect.service(require_bin.ServerConfig);
+		const serverConfig = yield* effect.Effect.service(require_Metrics.ServerConfig);
 		const nativeEventLogger = options?.nativeEventLogger ?? (options?.nativeEventLogPath !== void 0 ? yield* require_bin.makeEventNdjsonLogger(options.nativeEventLogPath, { stream: "native" }) : void 0);
 		const managedNativeEventLogger = options?.nativeEventLogger === void 0 ? nativeEventLogger : void 0;
 		const sessions = /* @__PURE__ */ new Map();
 		const threadLocksRef = yield* effect.SynchronizedRef.make(/* @__PURE__ */ new Map());
 		const runtimeEventPubSub = yield* effect.PubSub.unbounded();
 		const nowIso = effect.Effect.map(effect.DateTime.now, effect.DateTime.formatIso);
-		const nextEventId = effect.Effect.map(effect.Random.nextUUIDv4, (id) => require_bin.EventId.make(id));
+		const nextEventId = effect.Effect.map(effect.Random.nextUUIDv4, (id) => require_collectUint8StreamText.EventId.make(id));
 		const makeEventStamp = () => effect.Effect.all({
 			eventId: nextEventId,
 			createdAt: nowIso
@@ -5823,8 +5750,8 @@ function makeCursorAdapter(cursorSettings, options) {
 			const started = yield* effect.Effect.gen(function* () {
 				yield* acp.handleExtRequest("cursor/ask_question", CursorAskQuestionRequest, (params) => effect.Effect.gen(function* () {
 					yield* logNative(input.threadId, "cursor/ask_question", params, "acp.cursor.extension");
-					const requestId = require_bin.ApprovalRequestId.make(crypto.randomUUID());
-					const runtimeRequestId = require_bin.RuntimeRequestId.make(requestId);
+					const requestId = require_collectUint8StreamText.ApprovalRequestId.make(crypto.randomUUID());
+					const runtimeRequestId = require_collectUint8StreamText.RuntimeRequestId.make(requestId);
 					const answers = yield* effect.Deferred.make();
 					pendingUserInputs.set(requestId, { answers });
 					yield* offerRuntimeEvent({
@@ -5885,8 +5812,8 @@ function makeCursorAdapter(cursorSettings, options) {
 						} };
 					}
 					const permissionRequest = parsePermissionRequest(params);
-					const requestId = require_bin.ApprovalRequestId.make(crypto.randomUUID());
-					const runtimeRequestId = require_bin.RuntimeRequestId.make(requestId);
+					const requestId = require_collectUint8StreamText.ApprovalRequestId.make(crypto.randomUUID());
+					const runtimeRequestId = require_collectUint8StreamText.RuntimeRequestId.make(requestId);
 					const decision = yield* effect.Deferred.make();
 					pendingApprovals.set(requestId, {
 						decision,
@@ -5931,7 +5858,7 @@ function makeCursorAdapter(cursorSettings, options) {
 				mapError: ({ cause, method }) => mapAcpToAdapterError(PROVIDER, input.threadId, method, cause)
 			});
 			const now = yield* nowIso;
-			const tokenMode = input.tokenMode ?? require_bin.DEFAULT_AGENT_TOKEN_MODE;
+			const tokenMode = input.tokenMode ?? "balanced";
 			const session = {
 				provider: PROVIDER,
 				providerInstanceId: boundInstanceId,
@@ -6044,7 +5971,7 @@ function makeCursorAdapter(cursorSettings, options) {
 		}).pipe(effect.Effect.scoped));
 		const sendTurn = (input) => effect.Effect.gen(function* () {
 			const ctx = yield* requireSession(input.threadId);
-			const turnId = require_bin.TurnId.make(crypto.randomUUID());
+			const turnId = require_collectUint8StreamText.TurnId.make(crypto.randomUUID());
 			const turnModelSelection = input.modelSelection?.instanceId === boundInstanceId ? input.modelSelection : void 0;
 			const model = turnModelSelection?.model ?? ctx.session.model;
 			const resolvedModel = resolveCursorAcpBaseModelId(model);
@@ -6208,16 +6135,14 @@ function makeCursorAdapter(cursorSettings, options) {
 		};
 	});
 }
-
 //#endregion
 //#region src/provider/Drivers/CursorDriver.ts
 /**
 * CursorDriver — `ProviderDriver` for the Cursor Agent (`agent`) runtime.
 *
-* Cursor exposes an ACP-based CLI. The driver is still a plain value, but
-* its snapshot uses `makeManagedServerProvider`'s optional `enrichSnapshot`
-* hook to run the slow ACP model-capability probe in the background without
-* blocking the initial `ready`-state publish.
+* Cursor exposes an ACP-based CLI. Model catalog and capability refreshes
+* happen during the managed provider status check via Cursor's
+* `list_available_models` extension method.
 *
 * Text generation is supported via the ACP runtime — `makeCursorTextGeneration`
 * drives `runtime.prompt` with a structured-output schema and collects the
@@ -6225,7 +6150,7 @@ function makeCursorAdapter(cursorSettings, options) {
 *
 * @module provider/Drivers/CursorDriver
 */
-const DRIVER_KIND = require_bin.ProviderDriverKind.make("cursor");
+const DRIVER_KIND = require_collectUint8StreamText.ProviderDriverKind.make("cursor");
 const UPDATE = require_bin.makeStaticProviderMaintenanceResolver(require_bin.makeProviderMaintenanceCapabilities({
 	provider: DRIVER_KIND,
 	packageName: null,
@@ -6247,8 +6172,8 @@ const CursorDriver = {
 		displayName: "Cursor",
 		supportsMultipleInstances: true
 	},
-	configSchema: require_bin.CursorSettings,
-	defaultConfig: () => effect.Schema.decodeSync(require_bin.CursorSettings)({}),
+	configSchema: require_collectUint8StreamText.CursorSettings,
+	defaultConfig: () => effect.Schema.decodeSync(require_collectUint8StreamText.CursorSettings)({}),
 	create: ({ instanceId, displayName, accentColor, environment, enabled, config }) => effect.Effect.gen(function* () {
 		const spawner = yield* effect_unstable_process.ChildProcessSpawner.ChildProcessSpawner;
 		const fileSystem = yield* effect.FileSystem.FileSystem;
@@ -6297,13 +6222,12 @@ const CursorDriver = {
 				checkProvider,
 				enrichSnapshot: ({ settings, snapshot: currentSnapshot, publishSnapshot }) => enrichCursorSnapshot({
 					settings,
-					environment: processEnv,
 					snapshot: currentSnapshot,
 					maintenanceCapabilities,
 					publishSnapshot,
 					stampIdentity,
 					httpClient
-				}).pipe(effect.Effect.provideService(effect_unstable_process.ChildProcessSpawner.ChildProcessSpawner, spawner)),
+				}),
 				refreshInterval: null
 			}).pipe(effect.Effect.mapError((cause) => new require_bin.ProviderDriverError({
 				driver: DRIVER_KIND,
@@ -6316,6 +6240,5 @@ const CursorDriver = {
 		};
 	})
 };
-
 //#endregion
-exports.CursorDriver = CursorDriver;
+exports.CursorDriver = CursorDriver;