ryco-cli 0.1.29 → 0.1.31

package/dist/{CopilotDriver-C0OhnSB1.mjs → CopilotDriver-CUkdPXcH.mjs}

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
-import { Dr as TextGenerationError, Jr as CopilotSettings, Ko as DEFAULT_GIT_TEXT_GENERATION_MODEL_BY_PROVIDER, Oa as PROVIDER_SEND_TURN_MAX_ATTACHMENT_TOTAL_BYTES, Qo as ProviderInstanceId, Zo as ProviderDriverKind, ac as EventId, dc as ProviderItemId, fc as RuntimeItemId, gc as RuntimeTaskId, pc as RuntimeRequestId, qo as DEFAULT_GIT_TEXT_GENERATION_OPTIONS_BY_PROVIDER, qr as CodexSettings, yc as TurnId } from "./src-7E1M4gTQ.mjs";
-import { Dt as ServerConfig, Qt as getModelSelectionStringOptionValue, Yt as createModelCapabilities, nn as getProviderOptionStringSelectionValue } from "./Metrics-BjqGlIP4.mjs";
-import { $ as makeManualOnlyProviderMaintenanceCapabilities, A as makeEventNdjsonLogger, Bt as ProviderAdapterSessionNotFoundError, Ct as buildServerProvider, Er as resolveCommandPath, Et as isCommandMissingCause, Ft as redactAgentControlSecrets, Ht as ProviderDriverError, It as createProcessDeviceToolBinding, Lt as ProviderAdapterProcessError, Mt as agentControlHostContext, Pt as installAgentControlNativeHttp, Rt as ProviderAdapterRequestError, St as buildSelectOptionDescriptor, Vt as ProviderAdapterValidationError, _r as buildSideQuestionPrompt, br as extractJsonObject, dr as validateRankInboxThreadsResult, jt as AGENT_CONTROL_INTERNAL_SERVER_NAME, k as ProviderEventLoggers, kt as providerModelsFromSettings, mt as mergeProviderInstanceEnvironment, n as AgentControlSessionRegistry, ot as isPersistableChatAttachment, st as readPersistedAttachment, t as makeServerQueueMetrics, vr as buildThreadPriorityPrompt, wr as sanitizeThreadTitle, yr as buildThreadTitlePrompt } from "./bin.mjs";
-import { i as formatAttachmentPathLines, n as stampRuntimeEvent, r as appendAttachmentPathLines, t as requireRuntimeSessionId } from "./runtimeSession-V3RIy8Ao.mjs";
+import { Kt as getModelSelectionStringOptionValue, Nt as ServerConfig, Ut as createModelCapabilities, Xt as getProviderOptionStringSelectionValue } from "./Metrics-C3vLS9rz.mjs";
+import { Ad as ProviderItemId, Bs as DEFAULT_GIT_TEXT_GENERATION_MODEL_BY_PROVIDER, Ci as CopilotSettings, Fd as RuntimeTaskId, Ks as ProviderDriverKind, Md as RuntimeRequestId, Rd as TurnId, Si as CodexSettings, Vs as DEFAULT_GIT_TEXT_GENERATION_OPTIONS_BY_PROVIDER, ei as TextGenerationError, fo as PROVIDER_SEND_TURN_MAX_ATTACHMENT_TOTAL_BYTES, jd as RuntimeItemId, qs as ProviderInstanceId, wd as EventId } from "./src-VTj60bUm.mjs";
+import { $n as readPersistedAttachment, A as ProviderEventLoggers, At as isCommandMissingCause, Bt as createProcessDeviceToolBinding, Dt as buildServerProvider, Et as buildSelectOptionDescriptor, Ft as AGENT_CONTROL_INTERNAL_SERVER_NAME, Gt as ProviderAdapterValidationError, Ht as ProviderAdapterRequestError, It as agentControlHostContext, Kt as ProviderDriverError, Nt as providerModelsFromSettings, Qn as isPersistableChatAttachment, Rt as installAgentControlNativeHttp, Vt as ProviderAdapterProcessError, Wt as ProviderAdapterSessionNotFoundError, X as withoutHtmlRenderMarkup, Y as resolveHtmlRenderToolPresentation, _t as mergeProviderInstanceEnvironment, bi as sanitizeThreadTitle, gi as extractJsonObject, hi as buildThreadTitlePrompt, i as AgentControlSessionRegistry, j as makeEventNdjsonLogger, mi as buildThreadPriorityPrompt, ot as makeManualOnlyProviderMaintenanceCapabilities, pi as buildSideQuestionPrompt, r as makeServerQueueMetrics, si as validateRankInboxThreadsResult, wi as resolveCommandPath, zt as redactAgentControlSecrets } from "./bin.mjs";
+import { i as formatAttachmentPathLines, n as stampRuntimeEvent, r as appendAttachmentPathLines, t as requireRuntimeSessionId } from "./runtimeSession-D_BZ-wRH.mjs";
 import { t as defaultProviderContinuationIdentity } from "./ProviderDriver-kCV60GKk.mjs";
-import { n as sideQuestionEnvironment, t as sideQuestionDirectory } from "./SideQuestionIsolation-81IoAuoi.mjs";
-import { t as makeManagedServerProvider } from "./makeManagedServerProvider-B_lPFNpL.mjs";
-import { t as makeCodexTextGeneration } from "./CodexTextGeneration-Dwp6X3dq.mjs";
+import { n as sideQuestionEnvironment, t as sideQuestionDirectory } from "./SideQuestionIsolation-B1T-DsR0.mjs";
+import { t as makeManagedServerProvider } from "./makeManagedServerProvider-B65ipCxM.mjs";
+import { t as makeCodexTextGeneration } from "./CodexTextGeneration-BSgNgfZv.mjs";
 import { Effect, Option, Queue, Result, Schema, Stream } from "effect";
 import { randomUUID } from "node:crypto";
 import "effect/unstable/process";
@@ -208,9 +208,50 @@ function selectionTargetsCopilotInstance(value, instanceId) {
 }
 //#endregion
 //#region src/provider/Layers/CopilotAdapter.mapEvent.ts
+/** Ryco's HTML tools, named by Copilot's MCP server/tool pair or its joined tool name. */
+function htmlRenderToolPresentation(data, input) {
+	const field = (key) => {
+		const value = data[key];
+		return typeof value === "string" ? value : void 0;
+	};
+	const mcpToolName = field("mcpToolName");
+	return mcpToolName !== void 0 ? resolveHtmlRenderToolPresentation({
+		toolName: mcpToolName,
+		serverName: field("mcpServerName"),
+		input
+	}) : resolveHtmlRenderToolPresentation({
+		toolName: field("toolName"),
+		input
+	});
+}
+const MAX_REMEMBERED_HTML_RENDER_CALLS = 64;
+/** Remembers how a started HTML tool call shows, for its completion to show the same. */
+function rememberHtmlRenderToolCall(session, toolCallId, presentation) {
+	const calls = session.htmlRenderToolCalls;
+	calls.delete(toolCallId);
+	calls.set(toolCallId, presentation);
+	for (const oldest of calls.keys()) {
+		if (calls.size <= MAX_REMEMBERED_HTML_RENDER_CALLS) break;
+		calls.delete(oldest);
+	}
+}
+/** How a completed call showed when it started, forgotten once it is done. */
+function takeHtmlRenderToolCall(session, toolCallId) {
+	const presentation = session.htmlRenderToolCalls.get(toolCallId);
+	session.htmlRenderToolCalls.delete(toolCallId);
+	return presentation;
+}
 function nonNegativeCount(value) {
 	return value !== void 0 && Number.isSafeInteger(value) && value >= 0 ? value : void 0;
 }
+/**
+* Copilot quota and weekly-limit stops are durable usage limits. Its reset time is not
+* reported, and a generic `rate_limited` stays a transient provider error.
+*/
+function isCopilotUsageLimitError(data) {
+	if (data.errorType === "quota") return data.errorCode === "quota_exceeded" || data.errorCode === "session_quota_exceeded";
+	return data.errorType === "rate_limit" && data.errorCode === "user_weekly_rate_limited";
+}
 const mapEvent = (deps, session, event) => Effect.gen(function* () {
 	const turnId = session.activeTurnId;
 	const stamp = yield* deps.makeEventStamp();
@@ -445,13 +486,18 @@ const mapEvent = (deps, session, event) => Effect.gen(function* () {
 			type: "runtime.error",
 			payload: {
 				message: event.data.message,
-				class: "provider_error",
+				...isCopilotUsageLimitError(event.data) ? {
+					class: "usage_limit",
+					resetAt: null
+				} : { class: "provider_error" },
 				detail: event.data
 			}
 		}];
 		case "tool.execution_start": {
 			const toolName = event.data.toolName ?? "";
 			const isMcpTool = event.data.mcpToolName !== void 0;
+			const htmlRender = htmlRenderToolPresentation(event.data, event.data.arguments);
+			if (htmlRender) rememberHtmlRenderToolCall(session, event.data.toolCallId, htmlRender);
 			return [{
 				...eventBase({
 					eventId: stamp.eventId,
@@ -466,13 +512,16 @@ const mapEvent = (deps, session, event) => Effect.gen(function* () {
 				payload: {
 					itemType: isMcpTool ? "mcp_tool_call" : "dynamic_tool_call",
 					status: "inProgress",
-					title: toolName,
-					...event.data.arguments ? { data: event.data.arguments } : {}
+					title: htmlRender?.title ?? toolName,
+					...htmlRender?.detail ? { detail: htmlRender.detail } : {},
+					...event.data.arguments ? { data: htmlRender ? withoutHtmlRenderMarkup(event.data.arguments) : event.data.arguments } : {}
 				}
 			}];
 		}
 		case "tool.execution_complete": {
 			const isMcpTool = "mcpToolName" in event.data && event.data.mcpToolName !== void 0;
+			const htmlRender = takeHtmlRenderToolCall(session, event.data.toolCallId) ?? htmlRenderToolPresentation(event.data, void 0);
+			const resultDetail = htmlRender && event.data.success ? htmlRender.detail : event.data.result?.detailedContent ?? event.data.result?.content ?? event.data.error?.message;
 			return [{
 				...eventBase({
 					eventId: stamp.eventId,
@@ -487,8 +536,8 @@ const mapEvent = (deps, session, event) => Effect.gen(function* () {
 				payload: {
 					itemType: isMcpTool ? "mcp_tool_call" : "dynamic_tool_call",
 					status: event.data.success ? "completed" : "failed",
-					title: "Tool call",
-					...event.data.result?.detailedContent ?? event.data.result?.content ?? event.data.error?.message ? { detail: event.data.result?.detailedContent ?? event.data.result?.content ?? event.data.error?.message } : {},
+					title: htmlRender?.title ?? "Tool call",
+					...resultDetail ? { detail: resultDetail } : {},
 					data: event.data
 				}
 			}];
@@ -692,6 +741,7 @@ const makeStartSession = (deps) => (input) => Effect.gen(function* () {
 		pendingApprovals,
 		pendingUserInputs,
 		pendingTurnStarts: /* @__PURE__ */ new Set(),
+		htmlRenderToolCalls: /* @__PURE__ */ new Map(),
 		deviceToolBinding,
 		turns: [],
 		renewSession: () => client.createSession(sessionConfig),
@@ -766,10 +816,10 @@ const makeSendTurn = (deps) => (input) => Effect.gen(function* () {
 			pathLineEntries.push({ attachment });
 			return null;
 		}
-		const persisted = readPersistedAttachment({
+		const persisted = yield* Effect.promise(() => readPersistedAttachment({
 			attachmentsDir: deps.serverConfig.attachmentsDir,
 			attachment
-		});
+		}));
 		if (!persisted.ok) return yield* new ProviderAdapterRequestError({
 			provider: COPILOT_DRIVER_KIND,
 			method: "session.send",
@@ -933,10 +983,12 @@ const makeHasSession = (deps) => (threadId) => Effect.sync(() => deps.sessions.h
 const makeReadThread = (deps) => (threadId) => Effect.gen(function* () {
 	return buildThreadSnapshot(threadId, (yield* deps.requireSession(threadId)).turns);
 });
-const makeRollbackThread = () => (threadId) => Effect.succeed({
-	threadId,
-	turns: []
-});
+/** Copilot cannot forget turns; ProviderService refuses before reaching this. */
+const makeRollbackThread = () => () => Effect.fail(new ProviderAdapterRequestError({
+	provider: COPILOT_DRIVER_KIND,
+	method: "thread/rollback",
+	detail: "GitHub Copilot does not support conversation rollback."
+}));
 //#endregion
 //#region src/provider/Layers/CopilotAdapter.ts
 const FULL_ACCESS_AUTO_APPROVE_AFTER_MS = 600;
@@ -1047,7 +1099,10 @@ const makeCopilotAdapter = Effect.fn("makeCopilotAdapter")(function* (copilotSet
 	const buildSessionConfig = (input, pendingApprovals, pendingUserInputs, activeTurnId, stoppedRef) => ({
 		...selectionTargetsCopilotInstance(input.modelSelection, instanceId) ? {
 			model: input.modelSelection.model,
-			...getProviderOptionStringSelectionValue(input.modelSelection.options, "reasoningEffort") ? { reasoningEffort: getProviderOptionStringSelectionValue(input.modelSelection.options, "reasoningEffort") } : {}
+			...getProviderOptionStringSelectionValue(input.modelSelection.options, "reasoningEffort") ? {
+				reasoningEffort: getProviderOptionStringSelectionValue(input.modelSelection.options, "reasoningEffort"),
+				reasoningSummary: "detailed"
+			} : {}
 		} : {},
 		...input.cwd ? { workingDirectory: input.cwd } : {},
 		streaming: true,
@@ -1173,7 +1228,10 @@ const makeCopilotAdapter = Effect.fn("makeCopilotAdapter")(function* (copilotSet
 	const stopAll = makeStopAll(sessionDeps);
 	return {
 		provider: COPILOT_DRIVER_KIND,
-		capabilities: { sessionModelSwitch: "in-session" },
+		capabilities: {
+			sessionModelSwitch: "in-session",
+			resumeSurvivesCwdChange: false
+		},
 		startSession: makeStartSession(sessionDeps),
 		sendTurn: makeSendTurn(sessionDeps),
 		interruptTurn: makeInterruptTurn(sessionDeps),

package/dist/{CopilotDriver-B_jEqfYQ.cjs → CopilotDriver-DbaMDH16.cjs}

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
-const require_src = require("./src-BzVJd3Me.cjs");
-const require_Metrics = require("./Metrics-Bf96NJ4j.cjs");
+const require_Metrics = require("./Metrics-DjRPLE98.cjs");
+const require_src = require("./src-FmeCeBJ9.cjs");
 const require_bin = require("./bin.cjs");
 const require_runtimeSession = require("./runtimeSession-Bj0OUcNJ.cjs");
 const require_ProviderDriver = require("./ProviderDriver--rNeAi3B.cjs");
-const require_SideQuestionIsolation = require("./SideQuestionIsolation-CMPkCUP0.cjs");
-const require_makeManagedServerProvider = require("./makeManagedServerProvider-CUwxc0Pn.cjs");
-const require_CodexTextGeneration = require("./CodexTextGeneration-DFZ5y4gj.cjs");
+const require_SideQuestionIsolation = require("./SideQuestionIsolation-BPC-Bxsz.cjs");
+const require_makeManagedServerProvider = require("./makeManagedServerProvider-B5tP7tvg.cjs");
+const require_CodexTextGeneration = require("./CodexTextGeneration-C9MDQmZm.cjs");
 let effect = require("effect");
 let node_crypto = require("node:crypto");
 require("effect/unstable/process");
@@ -208,9 +208,50 @@ function selectionTargetsCopilotInstance(value, instanceId) {
 }
 //#endregion
 //#region src/provider/Layers/CopilotAdapter.mapEvent.ts
+/** Ryco's HTML tools, named by Copilot's MCP server/tool pair or its joined tool name. */
+function htmlRenderToolPresentation(data, input) {
+	const field = (key) => {
+		const value = data[key];
+		return typeof value === "string" ? value : void 0;
+	};
+	const mcpToolName = field("mcpToolName");
+	return mcpToolName !== void 0 ? require_bin.resolveHtmlRenderToolPresentation({
+		toolName: mcpToolName,
+		serverName: field("mcpServerName"),
+		input
+	}) : require_bin.resolveHtmlRenderToolPresentation({
+		toolName: field("toolName"),
+		input
+	});
+}
+const MAX_REMEMBERED_HTML_RENDER_CALLS = 64;
+/** Remembers how a started HTML tool call shows, for its completion to show the same. */
+function rememberHtmlRenderToolCall(session, toolCallId, presentation) {
+	const calls = session.htmlRenderToolCalls;
+	calls.delete(toolCallId);
+	calls.set(toolCallId, presentation);
+	for (const oldest of calls.keys()) {
+		if (calls.size <= MAX_REMEMBERED_HTML_RENDER_CALLS) break;
+		calls.delete(oldest);
+	}
+}
+/** How a completed call showed when it started, forgotten once it is done. */
+function takeHtmlRenderToolCall(session, toolCallId) {
+	const presentation = session.htmlRenderToolCalls.get(toolCallId);
+	session.htmlRenderToolCalls.delete(toolCallId);
+	return presentation;
+}
 function nonNegativeCount(value) {
 	return value !== void 0 && Number.isSafeInteger(value) && value >= 0 ? value : void 0;
 }
+/**
+* Copilot quota and weekly-limit stops are durable usage limits. Its reset time is not
+* reported, and a generic `rate_limited` stays a transient provider error.
+*/
+function isCopilotUsageLimitError(data) {
+	if (data.errorType === "quota") return data.errorCode === "quota_exceeded" || data.errorCode === "session_quota_exceeded";
+	return data.errorType === "rate_limit" && data.errorCode === "user_weekly_rate_limited";
+}
 const mapEvent = (deps, session, event) => effect.Effect.gen(function* () {
 	const turnId = session.activeTurnId;
 	const stamp = yield* deps.makeEventStamp();
@@ -445,13 +486,18 @@ const mapEvent = (deps, session, event) => effect.Effect.gen(function* () {
 			type: "runtime.error",
 			payload: {
 				message: event.data.message,
-				class: "provider_error",
+				...isCopilotUsageLimitError(event.data) ? {
+					class: "usage_limit",
+					resetAt: null
+				} : { class: "provider_error" },
 				detail: event.data
 			}
 		}];
 		case "tool.execution_start": {
 			const toolName = event.data.toolName ?? "";
 			const isMcpTool = event.data.mcpToolName !== void 0;
+			const htmlRender = htmlRenderToolPresentation(event.data, event.data.arguments);
+			if (htmlRender) rememberHtmlRenderToolCall(session, event.data.toolCallId, htmlRender);
 			return [{
 				...eventBase({
 					eventId: stamp.eventId,
@@ -466,13 +512,16 @@ const mapEvent = (deps, session, event) => effect.Effect.gen(function* () {
 				payload: {
 					itemType: isMcpTool ? "mcp_tool_call" : "dynamic_tool_call",
 					status: "inProgress",
-					title: toolName,
-					...event.data.arguments ? { data: event.data.arguments } : {}
+					title: htmlRender?.title ?? toolName,
+					...htmlRender?.detail ? { detail: htmlRender.detail } : {},
+					...event.data.arguments ? { data: htmlRender ? require_bin.withoutHtmlRenderMarkup(event.data.arguments) : event.data.arguments } : {}
 				}
 			}];
 		}
 		case "tool.execution_complete": {
 			const isMcpTool = "mcpToolName" in event.data && event.data.mcpToolName !== void 0;
+			const htmlRender = takeHtmlRenderToolCall(session, event.data.toolCallId) ?? htmlRenderToolPresentation(event.data, void 0);
+			const resultDetail = htmlRender && event.data.success ? htmlRender.detail : event.data.result?.detailedContent ?? event.data.result?.content ?? event.data.error?.message;
 			return [{
 				...eventBase({
 					eventId: stamp.eventId,
@@ -487,8 +536,8 @@ const mapEvent = (deps, session, event) => effect.Effect.gen(function* () {
 				payload: {
 					itemType: isMcpTool ? "mcp_tool_call" : "dynamic_tool_call",
 					status: event.data.success ? "completed" : "failed",
-					title: "Tool call",
-					...event.data.result?.detailedContent ?? event.data.result?.content ?? event.data.error?.message ? { detail: event.data.result?.detailedContent ?? event.data.result?.content ?? event.data.error?.message } : {},
+					title: htmlRender?.title ?? "Tool call",
+					...resultDetail ? { detail: resultDetail } : {},
 					data: event.data
 				}
 			}];
@@ -692,6 +741,7 @@ const makeStartSession = (deps) => (input) => effect.Effect.gen(function* () {
 		pendingApprovals,
 		pendingUserInputs,
 		pendingTurnStarts: /* @__PURE__ */ new Set(),
+		htmlRenderToolCalls: /* @__PURE__ */ new Map(),
 		deviceToolBinding,
 		turns: [],
 		renewSession: () => client.createSession(sessionConfig),
@@ -766,10 +816,10 @@ const makeSendTurn = (deps) => (input) => effect.Effect.gen(function* () {
 			pathLineEntries.push({ attachment });
 			return null;
 		}
-		const persisted = require_bin.readPersistedAttachment({
+		const persisted = yield* effect.Effect.promise(() => require_bin.readPersistedAttachment({
 			attachmentsDir: deps.serverConfig.attachmentsDir,
 			attachment
-		});
+		}));
 		if (!persisted.ok) return yield* new require_bin.ProviderAdapterRequestError({
 			provider: COPILOT_DRIVER_KIND,
 			method: "session.send",
@@ -933,10 +983,12 @@ const makeHasSession = (deps) => (threadId) => effect.Effect.sync(() => deps.ses
 const makeReadThread = (deps) => (threadId) => effect.Effect.gen(function* () {
 	return buildThreadSnapshot(threadId, (yield* deps.requireSession(threadId)).turns);
 });
-const makeRollbackThread = () => (threadId) => effect.Effect.succeed({
-	threadId,
-	turns: []
-});
+/** Copilot cannot forget turns; ProviderService refuses before reaching this. */
+const makeRollbackThread = () => () => effect.Effect.fail(new require_bin.ProviderAdapterRequestError({
+	provider: COPILOT_DRIVER_KIND,
+	method: "thread/rollback",
+	detail: "GitHub Copilot does not support conversation rollback."
+}));
 //#endregion
 //#region src/provider/Layers/CopilotAdapter.ts
 const FULL_ACCESS_AUTO_APPROVE_AFTER_MS = 600;
@@ -1047,7 +1099,10 @@ const makeCopilotAdapter = effect.Effect.fn("makeCopilotAdapter")(function* (cop
 	const buildSessionConfig = (input, pendingApprovals, pendingUserInputs, activeTurnId, stoppedRef) => ({
 		...selectionTargetsCopilotInstance(input.modelSelection, instanceId) ? {
 			model: input.modelSelection.model,
-			...require_Metrics.getProviderOptionStringSelectionValue(input.modelSelection.options, "reasoningEffort") ? { reasoningEffort: require_Metrics.getProviderOptionStringSelectionValue(input.modelSelection.options, "reasoningEffort") } : {}
+			...require_Metrics.getProviderOptionStringSelectionValue(input.modelSelection.options, "reasoningEffort") ? {
+				reasoningEffort: require_Metrics.getProviderOptionStringSelectionValue(input.modelSelection.options, "reasoningEffort"),
+				reasoningSummary: "detailed"
+			} : {}
 		} : {},
 		...input.cwd ? { workingDirectory: input.cwd } : {},
 		streaming: true,
@@ -1173,7 +1228,10 @@ const makeCopilotAdapter = effect.Effect.fn("makeCopilotAdapter")(function* (cop
 	const stopAll = makeStopAll(sessionDeps);
 	return {
 		provider: COPILOT_DRIVER_KIND,
-		capabilities: { sessionModelSwitch: "in-session" },
+		capabilities: {
+			sessionModelSwitch: "in-session",
+			resumeSurvivesCwdChange: false
+		},
 		startSession: makeStartSession(sessionDeps),
 		sendTurn: makeSendTurn(sessionDeps),
 		interruptTurn: makeInterruptTurn(sessionDeps),

package/dist/{CursorDriver-DinXkGP9.mjs → CursorDriver-B-ZilXJB.mjs}

@@ -1,16 +1,15 @@
 #!/usr/bin/env node
 
-import { Dr as TextGenerationError, Qo as ProviderInstanceId, Yr as CursorSettings, Zo as ProviderDriverKind, Zs as ApprovalRequestId, ac as EventId, pc as RuntimeRequestId, yc as TurnId } from "./src-7E1M4gTQ.mjs";
-import { $t as getProviderOptionBooleanSelectionValue, Dt as ServerConfig, X as ServerSettingsService, Yt as createModelCapabilities, nn as getProviderOptionStringSelectionValue } from "./Metrics-BjqGlIP4.mjs";
-import { m as sanitizeFeatureBranchName, p as sanitizeBranchFragment } from "./git-BKwGfw8A.mjs";
-import { A as makeEventNdjsonLogger, Bt as ProviderAdapterSessionNotFoundError, Cr as sanitizePrTitle, Ct as buildServerProvider, Et as isCommandMissingCause, Ht as ProviderDriverError, It as createProcessDeviceToolBinding, K as parsePermissionRequest, Lt as ProviderAdapterProcessError, Mt as agentControlHostContext, Nt as installAgentControlAcp, Q as enrichProviderSnapshotWithVersionAdvisory, Rt as ProviderAdapterRequestError, Sr as sanitizeCommitSubject, St as buildSelectOptionDescriptor, Vt as ProviderAdapterValidationError, W as AcpSessionRuntime, X as SessionConfigOption, br as extractJsonObject, ct as resolveAttachmentPath, dr as validateRankInboxThreadsResult, fr as buildBranchNamePrompt, gr as buildPrContentPrompt, hr as buildIssueContentTitlePrompt, it as resolveProviderMaintenanceCapabilitiesEffect, k as ProviderEventLoggers, kt as providerModelsFromSettings, mr as buildIssueContentPolishPrompt, mt as mergeProviderInstanceEnvironment, n as AgentControlSessionRegistry, nt as makeStaticProviderMaintenanceResolver, ot as isPersistableChatAttachment, pr as buildCommitMessagePrompt, tt as makeProviderMaintenanceCapabilities, vr as buildThreadPriorityPrompt, wr as sanitizeThreadTitle, wt as collectStreamAsString, xt as buildBooleanOptionDescriptor, yr as buildThreadTitlePrompt } from "./bin.mjs";
-import { a as makeAcpRequestOpenedEvent, c as makeAcpTokenUsageEvent, d as mapAcpToAdapterError, f as makeAcpSubagentRuntimeEvents, i as makeAcpPlanUpdatedEvent, l as makeAcpToolCallEvent, n as makeAcpAssistantItemEvent, o as makeAcpRequestResolvedEvent, r as makeAcpContentDeltaEvent, s as makeAcpThoughtDeltaEvent, t as makeAcpNativeLoggers, u as acpPermissionOutcome } from "./AcpNativeLogging-B6TtnnKL.mjs";
-import { i as formatAttachmentPathLines, n as stampRuntimeEvent, r as appendAttachmentPathLines, t as requireRuntimeSessionId } from "./runtimeSession-V3RIy8Ao.mjs";
+import { Nt as ServerConfig, Ut as createModelCapabilities, X as ServerSettingsService, Xt as getProviderOptionStringSelectionValue, qt as getProviderOptionBooleanSelectionValue } from "./Metrics-C3vLS9rz.mjs";
+import { Ks as ProviderDriverKind, Md as RuntimeRequestId, Rd as TurnId, ei as TextGenerationError, gd as ApprovalRequestId, qs as ProviderInstanceId, wd as EventId, wi as CursorSettings } from "./src-VTj60bUm.mjs";
+import { A as ProviderEventLoggers, At as isCommandMissingCause, Bt as createProcessDeviceToolBinding, Ci as sanitizeFeatureBranchName, Dt as buildServerProvider, Et as buildSelectOptionDescriptor, G as AcpSessionRuntime, Gt as ProviderAdapterValidationError, Ht as ProviderAdapterRequestError, It as agentControlHostContext, Kt as ProviderDriverError, Lt as installAgentControlAcp, Nt as providerModelsFromSettings, Ot as collectStreamAsString, Qn as isPersistableChatAttachment, Si as sanitizeBranchFragment, Tt as buildBooleanOptionDescriptor, Vt as ProviderAdapterProcessError, Wt as ProviderAdapterSessionNotFoundError, _t as mergeProviderInstanceEnvironment, at as enrichProviderSnapshotWithVersionAdvisory, bi as sanitizeThreadTitle, ci as buildBranchNamePrompt, ct as makeProviderMaintenanceCapabilities, di as buildIssueContentTitlePrompt, dt as resolveProviderMaintenanceCapabilitiesEffect, er as resolveAttachmentPath, et as SessionConfigOption, fi as buildPrContentPrompt, gi as extractJsonObject, hi as buildThreadTitlePrompt, i as AgentControlSessionRegistry, j as makeEventNdjsonLogger, li as buildCommitMessagePrompt, lt as makeStaticProviderMaintenanceResolver, mi as buildThreadPriorityPrompt, q as parsePermissionRequest, si as validateRankInboxThreadsResult, ui as buildIssueContentPolishPrompt, vi as sanitizeCommitSubject, yi as sanitizePrTitle } from "./bin.mjs";
+import { a as makeAcpRequestOpenedEvent, c as makeAcpTokenUsageEvent, d as failStartedTurnOnError, f as mapAcpToAdapterError, i as makeAcpPlanUpdatedEvent, l as makeAcpToolCallEvent, n as makeAcpAssistantItemEvent, o as makeAcpRequestResolvedEvent, p as makeAcpSubagentRuntimeEvents, r as makeAcpContentDeltaEvent, s as makeAcpThoughtDeltaEvent, t as makeAcpNativeLoggers, u as acpPermissionOutcome } from "./AcpNativeLogging-C7PC6imv.mjs";
+import { i as formatAttachmentPathLines, n as stampRuntimeEvent, r as appendAttachmentPathLines, t as requireRuntimeSessionId } from "./runtimeSession-D_BZ-wRH.mjs";
 import { t as defaultProviderContinuationIdentity } from "./ProviderDriver-kCV60GKk.mjs";
-import { t as makeManagedServerProvider } from "./makeManagedServerProvider-B_lPFNpL.mjs";
+import { t as makeManagedServerProvider } from "./makeManagedServerProvider-B65ipCxM.mjs";
 import { Cause, DateTime, Deferred, Effect, Exit, Fiber, FileSystem, Layer, Option, Path, PubSub, Ref, Result, Schema, Scope, Semaphore, Stream, SynchronizedRef } from "effect";
-import { HttpClient } from "effect/unstable/http";
 import * as nodePath from "node:path";
+import { HttpClient } from "effect/unstable/http";
 import * as nodeOs from "node:os";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 //#region src/provider/acp/CursorAcpExtension.ts
@@ -1476,7 +1475,8 @@ function makeCursorAdapter(cursorSettings, options) {
 				activeTurnId: turnId,
 				updatedAt: yield* nowIso
 			};
-			yield* offerRuntimeEventForRuntime(ctx.session.runtimeSessionId, {
+			const runtimeSessionId = ctx.session.runtimeSessionId;
+			yield* offerRuntimeEventForRuntime(runtimeSessionId, {
 				type: "turn.started",
 				...yield* makeEventStamp(),
 				provider: PROVIDER,
@@ -1484,90 +1484,109 @@ function makeCursorAdapter(cursorSettings, options) {
 				turnId,
 				payload: { model: resolvedModel }
 			});
-			const promptParts = [];
-			if (!ctx.agentControlHostContextDelivered && ctx.agentControlHostContext.length > 0) {
-				promptParts.push({
-					type: "text",
-					text: `<ryco_host_context>${ctx.agentControlHostContext}</ryco_host_context>`
-				});
-				ctx.agentControlHostContextDelivered = true;
-			}
-			const pathLineEntries = [];
-			const imageParts = [];
-			for (const attachment of input.attachments ?? []) {
-				if (!isPersistableChatAttachment(attachment) || attachment.type !== "image") {
-					pathLineEntries.push({
-						attachment,
-						...attachment.id === void 0 ? {} : { resolvedPath: resolveAttachmentPath({
-							attachmentsDir: serverConfig.attachmentsDir,
-							attachment
-						}) ?? void 0 }
+			let terminalEmitted = false;
+			return yield* Effect.gen(function* () {
+				const promptParts = [];
+				if (!ctx.agentControlHostContextDelivered && ctx.agentControlHostContext.length > 0) {
+					promptParts.push({
+						type: "text",
+						text: `<ryco_host_context>${ctx.agentControlHostContext}</ryco_host_context>`
+					});
+					ctx.agentControlHostContextDelivered = true;
+				}
+				const pathLineEntries = [];
+				const imageParts = [];
+				for (const attachment of input.attachments ?? []) {
+					if (!isPersistableChatAttachment(attachment) || attachment.type !== "image") {
+						pathLineEntries.push({
+							attachment,
+							...attachment.id === void 0 ? {} : { resolvedPath: resolveAttachmentPath({
+								attachmentsDir: serverConfig.attachmentsDir,
+								attachment
+							}) ?? void 0 }
+						});
+						continue;
+					}
+					const attachmentPath = resolveAttachmentPath({
+						attachmentsDir: serverConfig.attachmentsDir,
+						attachment
+					});
+					if (!attachmentPath) return yield* new ProviderAdapterRequestError({
+						provider: PROVIDER,
+						method: "session/prompt",
+						detail: `Invalid attachment id '${attachment.id}'.`
+					});
+					const bytes = yield* fileSystem.readFile(attachmentPath).pipe(Effect.mapError((cause) => new ProviderAdapterRequestError({
+						provider: PROVIDER,
+						method: "session/prompt",
+						detail: cause.message,
+						cause
+					})));
+					imageParts.push({
+						type: "image",
+						data: Buffer.from(bytes).toString("base64"),
+						mimeType: attachment.mimeType
 					});
-					continue;
 				}
-				const attachmentPath = resolveAttachmentPath({
-					attachmentsDir: serverConfig.attachmentsDir,
-					attachment
+				const promptText = appendAttachmentPathLines(input.input?.trim(), formatAttachmentPathLines(pathLineEntries));
+				if (promptText?.trim()) promptParts.push({
+					type: "text",
+					text: promptText
 				});
-				if (!attachmentPath) return yield* new ProviderAdapterRequestError({
+				promptParts.push(...imageParts);
+				if ((!promptText || promptText.trim().length === 0) && (!input.attachments || input.attachments.length === 0)) return yield* new ProviderAdapterValidationError({
 					provider: PROVIDER,
-					method: "session/prompt",
-					detail: `Invalid attachment id '${attachment.id}'.`
+					operation: "sendTurn",
+					issue: "Turn requires non-empty text or attachments."
+				});
+				if (ctx.agentControl) yield* ctx.agentControl.bindTurn(turnId);
+				const result = yield* ctx.acp.prompt({ prompt: promptParts }).pipe(Effect.mapError((error) => mapAcpToAdapterError(PROVIDER, input.threadId, "session/prompt", error))).pipe(Effect.ensuring(ctx.agentControl ? ctx.agentControl.retireTurn(turnId) : Effect.void));
+				ctx.turns.push({
+					id: turnId,
+					items: [{
+						prompt: promptParts,
+						result
+					}]
 				});
-				const bytes = yield* fileSystem.readFile(attachmentPath).pipe(Effect.mapError((cause) => new ProviderAdapterRequestError({
+				ctx.session = {
+					...ctx.session,
+					activeTurnId: turnId,
+					updatedAt: yield* nowIso,
+					model: resolvedModel
+				};
+				yield* offerRuntimeEventForRuntime(ctx.session.runtimeSessionId, {
+					type: "turn.completed",
+					...yield* makeEventStamp(),
 					provider: PROVIDER,
-					method: "session/prompt",
-					detail: cause.message,
-					cause
-				})));
-				imageParts.push({
-					type: "image",
-					data: Buffer.from(bytes).toString("base64"),
-					mimeType: attachment.mimeType
+					threadId: input.threadId,
+					turnId,
+					payload: {
+						state: result.stopReason === "cancelled" ? "cancelled" : "completed",
+						stopReason: result.stopReason ?? null
+					}
 				});
-			}
-			const promptText = appendAttachmentPathLines(input.input?.trim(), formatAttachmentPathLines(pathLineEntries));
-			if (promptText?.trim()) promptParts.push({
-				type: "text",
-				text: promptText
-			});
-			promptParts.push(...imageParts);
-			if ((!promptText || promptText.trim().length === 0) && (!input.attachments || input.attachments.length === 0)) return yield* new ProviderAdapterValidationError({
-				provider: PROVIDER,
-				operation: "sendTurn",
-				issue: "Turn requires non-empty text or attachments."
-			});
-			if (ctx.agentControl) yield* ctx.agentControl.bindTurn(turnId);
-			const result = yield* ctx.acp.prompt({ prompt: promptParts }).pipe(Effect.mapError((error) => mapAcpToAdapterError(PROVIDER, input.threadId, "session/prompt", error))).pipe(Effect.ensuring(ctx.agentControl ? ctx.agentControl.retireTurn(turnId) : Effect.void));
-			ctx.turns.push({
-				id: turnId,
-				items: [{
-					prompt: promptParts,
-					result
-				}]
-			});
-			ctx.session = {
-				...ctx.session,
-				activeTurnId: turnId,
-				updatedAt: yield* nowIso,
-				model: resolvedModel
-			};
-			yield* offerRuntimeEventForRuntime(ctx.session.runtimeSessionId, {
-				type: "turn.completed",
-				...yield* makeEventStamp(),
-				provider: PROVIDER,
-				threadId: input.threadId,
-				turnId,
-				payload: {
-					state: result.stopReason === "cancelled" ? "cancelled" : "completed",
-					stopReason: result.stopReason ?? null
-				}
-			});
-			return {
-				threadId: input.threadId,
-				turnId,
-				resumeCursor: ctx.session.resumeCursor
-			};
+				terminalEmitted = true;
+				return {
+					threadId: input.threadId,
+					turnId,
+					resumeCursor: ctx.session.resumeCursor
+				};
+			}).pipe(failStartedTurnOnError({
+				isTerminalEmitted: () => terminalEmitted,
+				emitFailed: (errorMessage) => Effect.gen(function* () {
+					yield* offerRuntimeEventForRuntime(runtimeSessionId, {
+						type: "turn.completed",
+						...yield* makeEventStamp(),
+						provider: PROVIDER,
+						threadId: input.threadId,
+						turnId,
+						payload: {
+							state: "failed",
+							errorMessage
+						}
+					});
+				})
+			}));
 		});
 		const interruptTurn = (threadId) => Effect.gen(function* () {
 			const ctx = yield* requireSession(threadId);
@@ -1600,19 +1619,13 @@ function makeCursorAdapter(cursorSettings, options) {
 				turns: (yield* requireSession(threadId)).turns
 			};
 		});
-		const rollbackThread = (threadId, numTurns) => Effect.gen(function* () {
-			const ctx = yield* requireSession(threadId);
-			if (!Number.isInteger(numTurns) || numTurns < 1) return yield* new ProviderAdapterValidationError({
+		const rollbackThread = (threadId) => Effect.gen(function* () {
+			yield* requireSession(threadId);
+			return yield* new ProviderAdapterRequestError({
 				provider: PROVIDER,
-				operation: "rollbackThread",
-				issue: "numTurns must be an integer >= 1."
+				method: "thread/rollback",
+				detail: "Cursor does not support conversation rollback."
 			});
-			const nextLength = Math.max(0, ctx.turns.length - numTurns);
-			ctx.turns.splice(nextLength);
-			return {
-				threadId,
-				turns: ctx.turns
-			};
 		});
 		const stopSession = (threadId) => withThreadLock(threadId, Effect.gen(function* () {
 			const ctx = yield* requireSession(threadId);
@@ -1628,7 +1641,11 @@ function makeCursorAdapter(cursorSettings, options) {
 		const streamEvents = Stream.fromPubSub(runtimeEventPubSub);
 		return {
 			provider: PROVIDER,
-			capabilities: { sessionModelSwitch: "in-session" },
+			capabilities: {
+				sessionModelSwitch: "in-session",
+				turnSubmission: "completion",
+				resumeSurvivesCwdChange: false
+			},
 			startSession,
 			sendTurn,
 			interruptTurn,