ryco-cli 0.1.5 → 0.1.7

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

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 
 const require_chunk = require("./chunk-jM1PLTSZ.cjs");
-const require_collectUint8StreamText = require("./collectUint8StreamText-DbCOJom3.cjs");
-const require_Metrics = require("./Metrics-DNOriWhP.cjs");
+const require_collectUint8StreamText = require("./collectUint8StreamText-uNXVRHOf.cjs");
+const require_Metrics = require("./Metrics-CIW1QH7M.cjs");
 const require_bin = require("./bin.cjs");
-const require_makeManagedServerProvider = require("./makeManagedServerProvider-C3cQUDkZ.cjs");
+const require_makeManagedServerProvider = require("./makeManagedServerProvider-3SD-Q5xh.cjs");
 const require_ProviderDriver = require("./ProviderDriver--rNeAi3B.cjs");
 let effect_Effect = require("effect/Effect");
 effect_Effect = require_chunk.__toESM(effect_Effect, 1);
@@ -23,13 +23,13 @@ node_os = require_chunk.__toESM(node_os, 1);
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path, 1);
 require("effect/unstable/rpc");
+let effect_unstable_process = require("effect/unstable/process");
 let effect_Context = require("effect/Context");
 effect_Context = require_chunk.__toESM(effect_Context, 1);
 let effect_Scope = require("effect/Scope");
 effect_Scope = require_chunk.__toESM(effect_Scope, 1);
 let effect_Stdio = require("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_chunk.__toESM(effect_Deferred, 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) {
@@ -5105,7 +5186,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 +5428,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 +5508,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 } : {},
@@ -5636,6 +5718,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 +6026,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 +6069,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");
@@ -6179,6 +6324,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 +6372,8 @@ const CursorDriver = {
 					maintenanceCapabilities,
 					publishSnapshot,
 					stampIdentity,
-					httpClient
+					httpClient,
+					serverSettings
 				}),
 				refreshInterval: null
 			}).pipe(effect.Effect.mapError((cause) => new require_bin.ProviderDriverError({

package/dist/{CursorDriver-BcAVbT8D.mjs → CursorDriver-D5LvIqUk.mjs}

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
-import { $n as ApprovalRequestId, I as CursorSettings, In as ProviderDriverKind, Ln as ProviderInstanceId, mr as RuntimeRequestId, or as EventId, pr as RuntimeItemId, v as TextGenerationError, vr as TurnId } from "./collectUint8StreamText-DuFJyaQh.mjs";
-import { L as sanitizeBranchFragment, R as sanitizeFeatureBranchName, U as ServerConfig } from "./Metrics-BCOc3Ml2.mjs";
-import { $ as ProviderAdapterSessionClosedError, A as makeStaticProviderMaintenanceResolver, E as enrichProviderSnapshotWithVersionAdvisory, H as buildSelectOptionDescriptor, I as mergeProviderInstanceEnvironment, K as isCommandMissingCause, M as resolveProviderMaintenanceCapabilitiesEffect, Q as ProviderAdapterRequestError, U as buildServerProvider, V as buildBooleanOptionDescriptor, W as collectStreamAsString, Y as providerModelsFromSettings, Z as ProviderAdapterProcessError, et as ProviderAdapterSessionNotFoundError, fn as getProviderOptionStringSelectionValue, h as makeEventNdjsonLogger, k as makeProviderMaintenanceCapabilities, ln as getProviderOptionBooleanSelectionValue, m as ProviderEventLoggers, nt as ProviderDriverError, on as createModelCapabilities, rn as resolveAttachmentPath, tt as ProviderAdapterValidationError } from "./bin.mjs";
-import { a as buildIssueContentTitlePrompt, c as extractJsonObject, d as sanitizePrTitle, f as sanitizeThreadTitle, i as buildIssueContentPolishPrompt, n as buildBranchNamePrompt, o as buildPrContentPrompt, r as buildCommitMessagePrompt, s as buildThreadTitlePrompt, t as makeManagedServerProvider, u as sanitizeCommitSubject } from "./makeManagedServerProvider-wFGZ2-vd.mjs";
+import { Bn as ProviderInstanceId, Sr as TurnId, _r as RuntimeRequestId, gr as RuntimeItemId, hr as ProviderItemId, lr as EventId, nr as ApprovalRequestId, vr as RuntimeSubagentId, x as TextGenerationError, z as CursorSettings, zn as ProviderDriverKind } from "./collectUint8StreamText-Lv4GGI79.mjs";
+import { U as sanitizeBranchFragment, W as sanitizeFeatureBranchName, Y as ServerConfig } from "./Metrics-6Xj17Se3.mjs";
+import { $t as makeProviderMaintenanceCapabilities, D as collectStreamAsString, E as buildServerProvider, F as ProviderAdapterRequestError, I as ProviderAdapterSessionClosedError, L as ProviderAdapterSessionNotFoundError, M as providerModelsFromSettings, P as ProviderAdapterProcessError, R as ProviderAdapterValidationError, T as buildSelectOptionDescriptor, Xt as enrichProviderSnapshotWithVersionAdvisory, an as resolveAttachmentPath, cn as createModelCapabilities, dn as getProviderOptionBooleanSelectionValue, en as makeStaticProviderMaintenanceResolver, g as makeEventNdjsonLogger, h as ProviderEventLoggers, in as ServerSettingsService, k as isCommandMissingCause, mn as getProviderOptionStringSelectionValue, nn as resolveProviderMaintenanceCapabilitiesEffect, w as buildBooleanOptionDescriptor, y as mergeProviderInstanceEnvironment, z as ProviderDriverError } from "./bin.mjs";
+import { a as buildIssueContentTitlePrompt, c as extractJsonObject, d as sanitizePrTitle, f as sanitizeThreadTitle, i as buildIssueContentPolishPrompt, n as buildBranchNamePrompt, o as buildPrContentPrompt, r as buildCommitMessagePrompt, s as buildThreadTitlePrompt, t as makeManagedServerProvider, u as sanitizeCommitSubject } from "./makeManagedServerProvider-CkPEptun.mjs";
 import { t as defaultProviderContinuationIdentity } from "./ProviderDriver-kCV60GKk.mjs";
 import * as Effect$1 from "effect/Effect";
 import * as Layer$1 from "effect/Layer";
@@ -15,10 +15,10 @@ import { HttpClient } from "effect/unstable/http";
 import * as nodeOs from "node:os";
 import * as nodePath from "node:path";
 import "effect/unstable/rpc";
+import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 import * as Context$1 from "effect/Context";
 import "effect/Scope";
 import * as Stdio from "effect/Stdio";
-import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 import "effect/Cause";
 import * as Deferred$1 from "effect/Deferred";
 import * as Queue$1 from "effect/Queue";
@@ -3918,8 +3918,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":
@@ -3929,6 +3943,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: RuntimeSubagentId.make(input.toolCallId),
+			origin: "inferred",
+			capability: "summary",
+			label,
+			...detail ? { description: detail } : {},
+			parentProviderItemId: ProviderItemId.make(input.toolCallId),
+			metadata
+		},
+		...status ? { status } : {},
+		summary: label,
+		...detail ? { detail } : {}
+	};
+}
 function makeToolCallState(input, options) {
 	const toolCallId = input.toolCallId.trim();
 	if (!toolCallId) return;
@@ -3946,13 +4000,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 } : {},
@@ -3960,6 +4029,7 @@ function makeToolCallState(input, options) {
 		...status ? { status } : {},
 		...command ? { command } : {},
 		...presentation?.detail ? { detail: presentation.detail } : {},
+		...subagent ? { subagent } : {},
 		data
 	};
 }
@@ -3981,6 +4051,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 } : {},
@@ -3988,10 +4071,8 @@ function mergeToolCallState(previous, next) {
 		...status ? { status } : {},
 		...command ? { command } : {},
 		...detail ? { detail } : {},
-		data: {
-			...previous?.data,
-			...next.data
-		}
+		...subagent ? { subagent } : {},
+		data
 	};
 }
 function parsePermissionRequest(params) {
@@ -5084,7 +5165,7 @@ const enrichCursorSnapshot = (input) => {
 	const { settings, snapshot, publishSnapshot } = input;
 	const stampIdentity = input.stampIdentity ?? ((value) => value);
 	if (!settings.enabled || snapshot.auth.status === "unauthenticated") return Effect.void;
-	return enrichProviderSnapshotWithVersionAdvisory(snapshot, input.maintenanceCapabilities).pipe(Effect.provideService(HttpClient.HttpClient, input.httpClient), Effect.flatMap((enrichedSnapshot) => publishSnapshot(stampIdentity(enrichedSnapshot)).pipe(Effect.asVoid)), Effect.catchCause((cause) => Effect.logWarning("Cursor version advisory enrichment failed", { cause: Cause.pretty(cause) }).pipe(Effect.asVoid)));
+	return enrichProviderSnapshotWithVersionAdvisory(snapshot, input.maintenanceCapabilities).pipe(Effect.provideService(HttpClient.HttpClient, input.httpClient), Effect.provideService(ServerSettingsService, input.serverSettings), Effect.flatMap((enrichedSnapshot) => publishSnapshot(stampIdentity(enrichedSnapshot)).pipe(Effect.asVoid)), Effect.catchCause((cause) => Effect.logWarning("Cursor version advisory enrichment failed", { cause: Cause.pretty(cause) }).pipe(Effect.asVoid)));
 };
 //#endregion
 //#region src/provider/acp/CursorAcpSupport.ts
@@ -5326,8 +5407,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":
@@ -5405,7 +5487,7 @@ function makeAcpToolCallEvent(input) {
 		turnId: input.turnId,
 		itemId: 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 } : {},
@@ -5615,6 +5697,66 @@ function makeCursorAdapter(cursorSettings, options) {
 			createdAt: nowIso
 		});
 		const offerRuntimeEvent = (event) => PubSub.publish(runtimeEventPubSub, event).pipe(Effect.asVoid);
+		const offerAcpSubagentRuntimeEvents = 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) => SynchronizedRef.modifyEffect(threadLocksRef, (current) => {
 			const existing = Option.fromNullishOr(current.get(threadId));
 			return Option.match(existing, {
@@ -5863,6 +6005,8 @@ function makeCursorAdapter(cursorSettings, options) {
 				pendingApprovals,
 				pendingUserInputs,
 				turns: [],
+				startedSubagentIds: /* @__PURE__ */ new Set(),
+				completedSubagentIds: /* @__PURE__ */ new Set(),
 				lastPlanFingerprint: void 0,
 				activeTurnId: void 0,
 				stopped: false
@@ -5904,6 +6048,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");
@@ -6158,6 +6303,7 @@ const CursorDriver = {
 		const fileSystem = yield* FileSystem.FileSystem;
 		const path = yield* Path.Path;
 		const httpClient = yield* HttpClient.HttpClient;
+		const serverSettings = yield* ServerSettingsService;
 		const eventLoggers = yield* ProviderEventLoggers;
 		const processEnv = mergeProviderInstanceEnvironment(environment);
 		const continuationIdentity = defaultProviderContinuationIdentity({
@@ -6205,7 +6351,8 @@ const CursorDriver = {
 					maintenanceCapabilities,
 					publishSnapshot,
 					stampIdentity,
-					httpClient
+					httpClient,
+					serverSettings
 				}),
 				refreshInterval: null
 			}).pipe(Effect.mapError((cause) => new ProviderDriverError({

package/dist/{ForgejoSourceControlProvider-D3wP2Cav.cjs → ForgejoSourceControlProvider-BTXRDCGB.cjs}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-const require_collectUint8StreamText = require("./collectUint8StreamText-DbCOJom3.cjs");
-const require_SourceControlProviderDiscoveryCatalog = require("./SourceControlProviderDiscoveryCatalog-DqQVhwYM.cjs");
+const require_collectUint8StreamText = require("./collectUint8StreamText-uNXVRHOf.cjs");
+const require_SourceControlProviderDiscoveryCatalog = require("./SourceControlProviderDiscoveryCatalog-DeFR5xH3.cjs");
 const require_bin = require("./bin.cjs");
 let effect = require("effect");
 //#region src/sourceControl/ForgejoSourceControlProvider.ts

package/dist/{ForgejoSourceControlProvider-BjCE3730.mjs → ForgejoSourceControlProvider-e-4hvvZ_.mjs}

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
-import { Cn as SourceControlProviderError, Tn as truncateSourceControlDetailContent } from "./collectUint8StreamText-DuFJyaQh.mjs";
-import { a as makeForgejoDiscovery, p as sourceControlRefFromInput, u as SourceControlProvider } from "./SourceControlProviderDiscoveryCatalog-CQiMyDCC.mjs";
-import { C as ForgejoApi } from "./bin.mjs";
+import { En as SourceControlProviderError, On as truncateSourceControlDetailContent } from "./collectUint8StreamText-Lv4GGI79.mjs";
+import { a as makeForgejoDiscovery, l as sourceControlRefFromInput, o as SourceControlProvider } from "./SourceControlProviderDiscoveryCatalog-mJV_Xitr.mjs";
+import { qt as ForgejoApi } from "./bin.mjs";
 import { DateTime, Effect, Layer, Option } from "effect";
 //#region src/sourceControl/ForgejoSourceControlProvider.ts
 function providerError(operation, cause) {

package/dist/{GitHubSourceControlProvider-DByZ_cnw.mjs → GitHubSourceControlProvider-26IofDAO.mjs}

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
-import { Cn as SourceControlProviderError, Sn as SOURCE_CONTROL_WORKFLOW_LOG_MAX_BYTES, Tn as truncateSourceControlDetailContent } from "./collectUint8StreamText-DuFJyaQh.mjs";
-import { n as githubDiscovery, u as SourceControlProvider } from "./SourceControlProviderDiscoveryCatalog-CQiMyDCC.mjs";
+import { En as SourceControlProviderError, On as truncateSourceControlDetailContent, Tn as SOURCE_CONTROL_WORKFLOW_LOG_MAX_BYTES } from "./collectUint8StreamText-Lv4GGI79.mjs";
+import { n as githubDiscovery, o as SourceControlProvider } from "./SourceControlProviderDiscoveryCatalog-mJV_Xitr.mjs";
 import { i as parseGitHubRepositoryOwnerFromUrl, t as classifySourceControlCommentAuthorRole } from "./sourceControl-iWG-m4wE.mjs";
-import { S as decodeGitHubPullRequestListJson, _ as GITHUB_PULL_REQUEST_LIST_JSON_FIELDS, b as isStatusCheckRollupAccessError, v as GitHubCli, x as withoutStatusCheckRollupJsonField, y as formatGitHubJsonFields } from "./bin.mjs";
+import { Gt as withoutStatusCheckRollupJsonField, Ht as GitHubCli, Kt as decodeGitHubPullRequestListJson, Ut as formatGitHubJsonFields, Vt as GITHUB_PULL_REQUEST_LIST_JSON_FIELDS, Wt as isStatusCheckRollupAccessError } from "./bin.mjs";
 import { DateTime, Effect, FileSystem, Layer, Option, Result, Schema } from "effect";
 import { createHash } from "node:crypto";
 //#region src/sourceControl/GitHubSourceControlProvider.ts

package/dist/{GitHubSourceControlProvider-DU_7IvMa.cjs → GitHubSourceControlProvider-DWmwkA_y.cjs}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-const require_collectUint8StreamText = require("./collectUint8StreamText-DbCOJom3.cjs");
-const require_SourceControlProviderDiscoveryCatalog = require("./SourceControlProviderDiscoveryCatalog-DqQVhwYM.cjs");
+const require_collectUint8StreamText = require("./collectUint8StreamText-uNXVRHOf.cjs");
+const require_SourceControlProviderDiscoveryCatalog = require("./SourceControlProviderDiscoveryCatalog-DeFR5xH3.cjs");
 const require_sourceControl = require("./sourceControl-x2t62T8h.cjs");
 const require_bin = require("./bin.cjs");
 let effect = require("effect");

package/dist/{GitLabSourceControlProvider-BVJ5IqTS.cjs → GitLabSourceControlProvider-D-YHnxRe.cjs}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-const require_collectUint8StreamText = require("./collectUint8StreamText-DbCOJom3.cjs");
-const require_SourceControlProviderDiscoveryCatalog = require("./SourceControlProviderDiscoveryCatalog-DqQVhwYM.cjs");
+const require_collectUint8StreamText = require("./collectUint8StreamText-uNXVRHOf.cjs");
+const require_SourceControlProviderDiscoveryCatalog = require("./SourceControlProviderDiscoveryCatalog-DeFR5xH3.cjs");
 const require_bin = require("./bin.cjs");
 let effect = require("effect");
 //#region src/sourceControl/GitLabSourceControlProvider.ts