ryco-cli 0.1.6 → 0.1.8

package/dist/{CursorDriver-DTVPXZ-R.cjs → CursorDriver-BlvQbOEZ.cjs}

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 
 const require_chunk = require("./chunk-jM1PLTSZ.cjs");
-const require_collectUint8StreamText = require("./collectUint8StreamText-TCG6xW_P.cjs");
+const require_collectUint8StreamText = require("./collectUint8StreamText-B-GW3u_2.cjs");
 const require_Metrics = require("./Metrics-CIW1QH7M.cjs");
 const require_bin = require("./bin.cjs");
-const require_makeManagedServerProvider = require("./makeManagedServerProvider-DPFw9gV_.cjs");
+const require_makeManagedServerProvider = require("./makeManagedServerProvider-DTsQ87HL.cjs");
 const require_ProviderDriver = require("./ProviderDriver--rNeAi3B.cjs");
 let effect_Effect = require("effect/Effect");
 effect_Effect = require_chunk.__toESM(effect_Effect, 1);
@@ -3939,8 +3939,22 @@ function extractTextContentFromToolCallContent(content) {
 function normalizeToolKind(kind) {
 	return typeof kind === "string" && kind.trim().length > 0 ? kind.trim() : void 0;
 }
-function canonicalItemTypeFromAcpToolKind$1(kind) {
-	switch (kind) {
+function containsSubagentKeyword(value) {
+	return value !== void 0 && /\b(sub[-\s]?agent|subtask|delegate|delegation)\b/i.test(value);
+}
+function hasExplicitSubagentType(data) {
+	const subagentType = (isRecord$1(data?.rawInput) ? data.rawInput : void 0)?.subagent_type;
+	return typeof subagentType === "string" && subagentType.trim().length > 0;
+}
+function isAcpSubagentToolCall(input) {
+	if (containsSubagentKeyword(input.kind) || containsSubagentKeyword(input.title) || containsSubagentKeyword(input.command) || containsSubagentKeyword(input.detail)) return true;
+	if (hasExplicitSubagentType(input.data)) return true;
+	const rawInput = isRecord$1(input.data?.rawInput) ? input.data.rawInput : void 0;
+	return containsSubagentKeyword(typeof rawInput?.tool === "string" ? rawInput.tool : void 0) || containsSubagentKeyword(typeof rawInput?.name === "string" ? rawInput.name : void 0);
+}
+function canonicalItemTypeFromAcpTool(input) {
+	if (isAcpSubagentToolCall(input)) return "collab_agent_tool_call";
+	switch (input.kind) {
 		case "execute": return "command_execution";
 		case "edit":
 		case "delete":
@@ -3950,6 +3964,46 @@ function canonicalItemTypeFromAcpToolKind$1(kind) {
 		default: return "dynamic_tool_call";
 	}
 }
+function acpSubagentStatusFromToolStatus(status) {
+	switch (status) {
+		case "pending": return "starting";
+		case "inProgress": return "running";
+		case "completed": return "completed";
+		case "failed": return "failed";
+		default: return;
+	}
+}
+function rawInputStringField(data, field) {
+	const rawInput = isRecord$1(data?.rawInput) ? data.rawInput : void 0;
+	if (!rawInput) return;
+	const value = rawInput[field];
+	return typeof value === "string" && value.trim().length > 0 ? value.trim() : void 0;
+}
+function makeAcpSubagentSummaryState(input) {
+	if (!isAcpSubagentToolCall(input)) return;
+	const label = input.title ?? rawInputStringField(input.data, "name") ?? "ACP subagent";
+	const detail = input.detail ?? rawInputStringField(input.data, "description") ?? rawInputStringField(input.data, "prompt") ?? input.command;
+	const metadata = Object.fromEntries([
+		["source", "acp.tool_call"],
+		["kind", input.kind],
+		["command", input.command]
+	].filter(([, value]) => value !== void 0));
+	const status = acpSubagentStatusFromToolStatus(input.status);
+	return {
+		subagent: {
+			subagentId: require_collectUint8StreamText.RuntimeSubagentId.make(input.toolCallId),
+			origin: "inferred",
+			capability: "summary",
+			label,
+			...detail ? { description: detail } : {},
+			parentProviderItemId: require_collectUint8StreamText.ProviderItemId.make(input.toolCallId),
+			metadata
+		},
+		...status ? { status } : {},
+		summary: label,
+		...detail ? { detail } : {}
+	};
+}
 function makeToolCallState(input, options) {
 	const toolCallId = input.toolCallId.trim();
 	if (!toolCallId) return;
@@ -3967,13 +4021,28 @@ function makeToolCallState(input, options) {
 	if (input.locations !== void 0) data.locations = input.locations;
 	const fallbackDetail = command ?? normalizedTitle ?? textContent;
 	const presentation = title !== void 0 || kind !== void 0 || command !== void 0 || normalizedTitle !== void 0 || textContent !== void 0 ? deriveToolActivityPresentation({
-		itemType: canonicalItemTypeFromAcpToolKind$1(kind),
+		itemType: canonicalItemTypeFromAcpTool({
+			kind,
+			title,
+			command,
+			detail: fallbackDetail,
+			data
+		}),
 		title,
 		detail: fallbackDetail,
 		data,
 		fallbackSummary: title ?? "Tool"
 	}) : void 0;
 	const status = normalizeToolCallStatus(input.status, options?.fallbackStatus);
+	const subagent = makeAcpSubagentSummaryState({
+		toolCallId,
+		...kind ? { kind } : {},
+		...presentation?.summary ? { title: presentation.summary } : {},
+		...status ? { status } : {},
+		...command ? { command } : {},
+		...presentation?.detail ? { detail: presentation.detail } : {},
+		data
+	});
 	return {
 		toolCallId,
 		...kind ? { kind } : {},
@@ -3981,6 +4050,7 @@ function makeToolCallState(input, options) {
 		...status ? { status } : {},
 		...command ? { command } : {},
 		...presentation?.detail ? { detail: presentation.detail } : {},
+		...subagent ? { subagent } : {},
 		data
 	};
 }
@@ -4002,6 +4072,19 @@ function mergeToolCallState(previous, next) {
 	const status = next.status ?? previous?.status;
 	const command = next.command ?? previous?.command;
 	const detail = next.detail ?? previous?.detail;
+	const data = {
+		...previous?.data,
+		...next.data
+	};
+	const subagent = makeAcpSubagentSummaryState({
+		toolCallId: next.toolCallId,
+		...kind ? { kind } : {},
+		...title ? { title } : {},
+		...status ? { status } : {},
+		...command ? { command } : {},
+		...detail ? { detail } : {},
+		data
+	});
 	return {
 		toolCallId: next.toolCallId,
 		...kind ? { kind } : {},
@@ -4009,10 +4092,8 @@ function mergeToolCallState(previous, next) {
 		...status ? { status } : {},
 		...command ? { command } : {},
 		...detail ? { detail } : {},
-		data: {
-			...previous?.data,
-			...next.data
-		}
+		...subagent ? { subagent } : {},
+		data
 	};
 }
 function parsePermissionRequest(params) {
@@ -4083,6 +4164,17 @@ function parseSessionUpdateEvent(params) {
 				rawPayload: params
 			});
 			break;
+		case "usage_update":
+			if (upd.used > 0) events.push({
+				_tag: "UsageUpdated",
+				usage: {
+					usedTokens: upd.used,
+					lastUsedTokens: upd.used,
+					...upd.size > 0 ? { maxTokens: upd.size } : {}
+				},
+				rawPayload: params
+			});
+			break;
 		default: break;
 	}
 	return {
@@ -4501,7 +4593,8 @@ const PROVIDER$1 = require_collectUint8StreamText.ProviderDriverKind.make("curso
 const CURSOR_PRESENTATION = {
 	displayName: "Cursor",
 	badgeLabel: "Early Access",
-	showInteractionModeToggle: true
+	showInteractionModeToggle: true,
+	supportsAskMode: true
 };
 const EMPTY_CAPABILITIES = require_bin.createModelCapabilities({ optionDescriptors: [] });
 const CURSOR_ACP_MODEL_DISCOVERY_TIMEOUT_MS = 15e3;
@@ -5105,7 +5198,7 @@ const enrichCursorSnapshot = (input) => {
 	const { settings, snapshot, publishSnapshot } = input;
 	const stampIdentity = input.stampIdentity ?? ((value) => value);
 	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)));
+	return require_bin.enrichProviderSnapshotWithVersionAdvisory(snapshot, input.maintenanceCapabilities).pipe(effect.Effect.provideService(effect_unstable_http.HttpClient.HttpClient, input.httpClient), effect.Effect.provideService(require_bin.ServerSettingsService, input.serverSettings), 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
@@ -5347,8 +5440,9 @@ function canonicalRequestTypeFromAcpKind(kind) {
 		default: return "unknown";
 	}
 }
-function canonicalItemTypeFromAcpToolKind(kind) {
-	switch (kind) {
+function canonicalItemTypeFromAcpToolCall(toolCall) {
+	if (isAcpSubagentToolCall(toolCall)) return "collab_agent_tool_call";
+	switch (toolCall.kind) {
 		case "execute": return "command_execution";
 		case "edit":
 		case "delete":
@@ -5426,7 +5520,7 @@ function makeAcpToolCallEvent(input) {
 		turnId: input.turnId,
 		itemId: require_collectUint8StreamText.RuntimeItemId.make(input.toolCall.toolCallId),
 		payload: {
-			itemType: canonicalItemTypeFromAcpToolKind(input.toolCall.kind),
+			itemType: canonicalItemTypeFromAcpToolCall(input.toolCall),
 			...runtimeStatus ? { status: runtimeStatus } : {},
 			...input.toolCall.title ? { title: input.toolCall.title } : {},
 			...input.toolCall.detail ? { detail: input.toolCall.detail } : {},
@@ -5472,6 +5566,21 @@ function makeAcpContentDeltaEvent(input) {
 		}
 	};
 }
+function makeAcpTokenUsageEvent(input) {
+	return {
+		type: "thread.token-usage.updated",
+		...input.stamp,
+		provider: input.provider,
+		threadId: input.threadId,
+		turnId: input.turnId,
+		payload: { usage: input.usage },
+		raw: {
+			source: "acp.jsonrpc",
+			method: "session/update",
+			payload: input.rawPayload
+		}
+	};
+}
 //#endregion
 //#region src/provider/acp/AcpNativeLogging.ts
 function writeNativeAcpLog(input) {
@@ -5586,6 +5695,7 @@ function resolveRequestedModeId(input) {
 	const modeState = input.modeState;
 	if (!modeState) return;
 	if (input.interactionMode === "plan") return findModeByAliases(modeState.availableModes, ACP_PLAN_MODE_ALIASES)?.id;
+	if (input.interactionMode === "ask") return findModeByAliases(modeState.availableModes, ACP_APPROVAL_MODE_ALIASES)?.id;
 	if (input.runtimeMode === "approval-required") return findModeByAliases(modeState.availableModes, ACP_APPROVAL_MODE_ALIASES)?.id ?? findModeByAliases(modeState.availableModes, ACP_IMPLEMENT_MODE_ALIASES)?.id ?? modeState.availableModes.find((mode) => !isPlanMode(mode))?.id ?? modeState.currentModeId;
 	return findModeByAliases(modeState.availableModes, ACP_IMPLEMENT_MODE_ALIASES)?.id ?? findModeByAliases(modeState.availableModes, ACP_APPROVAL_MODE_ALIASES)?.id ?? modeState.availableModes.find((mode) => !isPlanMode(mode))?.id ?? modeState.currentModeId;
 }
@@ -5636,6 +5746,66 @@ function makeCursorAdapter(cursorSettings, options) {
 			createdAt: nowIso
 		});
 		const offerRuntimeEvent = (event) => effect.PubSub.publish(runtimeEventPubSub, event).pipe(effect.Effect.asVoid);
+		const offerAcpSubagentRuntimeEvents = effect.Effect.fn("offerAcpSubagentRuntimeEvents")(function* (ctx, subagentState, rawPayload) {
+			if (!subagentState) return;
+			const subagentId = String(subagentState.subagent.subagentId);
+			if (!ctx.startedSubagentIds.has(subagentId)) {
+				ctx.startedSubagentIds.add(subagentId);
+				yield* offerRuntimeEvent({
+					type: "subagent.started",
+					...yield* makeEventStamp(),
+					provider: PROVIDER,
+					threadId: ctx.threadId,
+					...ctx.activeTurnId ? { turnId: ctx.activeTurnId } : {},
+					payload: { subagent: subagentState.subagent },
+					raw: {
+						source: "acp.jsonrpc",
+						method: "session/update",
+						payload: rawPayload
+					}
+				});
+			}
+			if (subagentState.status === "completed" || subagentState.status === "failed" || subagentState.status === "stopped") {
+				if (ctx.completedSubagentIds.has(subagentId)) return;
+				ctx.completedSubagentIds.add(subagentId);
+				yield* offerRuntimeEvent({
+					type: "subagent.completed",
+					...yield* makeEventStamp(),
+					provider: PROVIDER,
+					threadId: ctx.threadId,
+					...ctx.activeTurnId ? { turnId: ctx.activeTurnId } : {},
+					payload: {
+						subagent: subagentState.subagent,
+						status: subagentState.status,
+						...subagentState.summary ? { summary: subagentState.summary } : {}
+					},
+					raw: {
+						source: "acp.jsonrpc",
+						method: "session/update",
+						payload: rawPayload
+					}
+				});
+				return;
+			}
+			yield* offerRuntimeEvent({
+				type: "subagent.updated",
+				...yield* makeEventStamp(),
+				provider: PROVIDER,
+				threadId: ctx.threadId,
+				...ctx.activeTurnId ? { turnId: ctx.activeTurnId } : {},
+				payload: {
+					subagent: subagentState.subagent,
+					...subagentState.status ? { status: subagentState.status } : {},
+					...subagentState.summary ? { summary: subagentState.summary } : {},
+					...subagentState.detail ? { detail: subagentState.detail } : {}
+				},
+				raw: {
+					source: "acp.jsonrpc",
+					method: "session/update",
+					payload: rawPayload
+				}
+			});
+		});
 		const getThreadSemaphore = (threadId) => effect.SynchronizedRef.modifyEffect(threadLocksRef, (current) => {
 			const existing = effect.Option.fromNullishOr(current.get(threadId));
 			return effect.Option.match(existing, {
@@ -5884,6 +6054,8 @@ function makeCursorAdapter(cursorSettings, options) {
 				pendingApprovals,
 				pendingUserInputs,
 				turns: [],
+				startedSubagentIds: /* @__PURE__ */ new Set(),
+				completedSubagentIds: /* @__PURE__ */ new Set(),
 				lastPlanFingerprint: void 0,
 				activeTurnId: void 0,
 				stopped: false
@@ -5925,6 +6097,7 @@ function makeCursorAdapter(cursorSettings, options) {
 							toolCall: event.toolCall,
 							rawPayload: event.rawPayload
 						}));
+						yield* offerAcpSubagentRuntimeEvents(ctx, event.toolCall.subagent, event.rawPayload);
 						return;
 					case "ContentDelta":
 						yield* logNative(ctx.threadId, "session/update", event.rawPayload, "acp.jsonrpc");
@@ -5938,6 +6111,17 @@ function makeCursorAdapter(cursorSettings, options) {
 							rawPayload: event.rawPayload
 						}));
 						return;
+					case "UsageUpdated":
+						yield* logNative(ctx.threadId, "session/update", event.rawPayload, "acp.jsonrpc");
+						yield* offerRuntimeEvent(makeAcpTokenUsageEvent({
+							stamp: yield* makeEventStamp(),
+							provider: PROVIDER,
+							threadId: ctx.threadId,
+							turnId: ctx.activeTurnId,
+							usage: event.usage,
+							rawPayload: event.rawPayload
+						}));
+						return;
 				}
 			}))).pipe(effect.Effect.forkChild);
 			ctx.notificationFiber = nf;
@@ -6179,6 +6363,7 @@ const CursorDriver = {
 		const fileSystem = yield* effect.FileSystem.FileSystem;
 		const path = yield* effect.Path.Path;
 		const httpClient = yield* effect_unstable_http.HttpClient.HttpClient;
+		const serverSettings = yield* require_bin.ServerSettingsService;
 		const eventLoggers = yield* require_bin.ProviderEventLoggers;
 		const processEnv = require_bin.mergeProviderInstanceEnvironment(environment);
 		const continuationIdentity = require_ProviderDriver.defaultProviderContinuationIdentity({
@@ -6226,7 +6411,8 @@ const CursorDriver = {
 					maintenanceCapabilities,
 					publishSnapshot,
 					stampIdentity,
-					httpClient
+					httpClient,
+					serverSettings
 				}),
 				refreshInterval: null
 			}).pipe(effect.Effect.mapError((cause) => new require_bin.ProviderDriverError({