ryco-cli 0.1.21 → 0.1.22

package/dist/{CopilotDriver-Bm4OZMkm.cjs → CopilotDriver-DJvYncGI.cjs}

@@ -1,15 +1,21 @@
 #!/usr/bin/env node
 
-const require_collectUint8StreamText = require("./collectUint8StreamText-C5fop6Zf.cjs");
+const require_collectUint8StreamText = require("./collectUint8StreamText-DStwNTTK.cjs");
 const require_Metrics = require("./Metrics-DIjMQ5pa.cjs");
 const require_bin = require("./bin.cjs");
-const require_makeManagedServerProvider = require("./makeManagedServerProvider-BytnBN6b.cjs");
+const require_makeManagedServerProvider = require("./makeManagedServerProvider-VzxWN-04.cjs");
 const require_ProviderDriver = require("./ProviderDriver--rNeAi3B.cjs");
-const require_CodexTextGeneration = require("./CodexTextGeneration-CBJHkgOz.cjs");
+const require_CodexTextGeneration = require("./CodexTextGeneration-B4tJTUDo.cjs");
 let effect = require("effect");
 let node_crypto = require("node:crypto");
 require("effect/unstable/process");
 let _github_copilot_sdk = require("@github/copilot-sdk");
+//#region src/provider/Layers/CopilotAdapter.eventScope.ts
+/** Wildcard SDK subscriptions include child events, including their turn and abort events. */
+function isCopilotChildEvent(event) {
+	return Boolean(event.agentId || "parentToolCallId" in event.data && event.data.parentToolCallId);
+}
+//#endregion
 //#region src/provider/Layers/CopilotAdapter.types.ts
 const COPILOT_DRIVER_KIND = require_collectUint8StreamText.ProviderDriverKind.make("copilot");
 const DEFAULT_BINARY_PATH = "copilot";
@@ -200,6 +206,9 @@ function selectionTargetsCopilotInstance(value, instanceId) {
 }
 //#endregion
 //#region src/provider/Layers/CopilotAdapter.mapEvent.ts
+function nonNegativeCount(value) {
+	return value !== void 0 && Number.isSafeInteger(value) && value >= 0 ? value : void 0;
+}
 const mapEvent = (deps, session, event) => effect.Effect.gen(function* () {
 	const turnId = session.activeTurnId;
 	const stamp = yield* deps.makeEventStamp();
@@ -208,6 +217,57 @@ const mapEvent = (deps, session, event) => effect.Effect.gen(function* () {
 		method: event.type,
 		payload: event
 	};
+	if (event.type === "subagent.started" || event.type === "subagent.completed" || event.type === "subagent.failed") {
+		const data = event.data;
+		const linkage = {
+			taskId: require_collectUint8StreamText.RuntimeTaskId.make(`copilot-task:${data.toolCallId}`),
+			taskType: "subagent",
+			title: data.agentDisplayName.trim() || data.agentName.trim() || "Copilot agent",
+			...data.agentName.trim() ? { role: data.agentName.trim() } : {},
+			...data.model?.trim() ? { model: data.model.trim() } : {},
+			toolUseId: data.toolCallId
+		};
+		const base = eventBase({
+			eventId: stamp.eventId,
+			createdAt: event.timestamp,
+			threadId: session.threadId,
+			providerInstanceId: session.providerInstanceId,
+			...turnId ? { turnId } : {},
+			raw
+		});
+		if (event.type === "subagent.started") return [{
+			...base,
+			type: "task.started",
+			payload: {
+				...linkage,
+				...event.data.agentDescription.trim() ? { description: event.data.agentDescription.trim() } : {}
+			}
+		}];
+		const terminal = event.data;
+		const totalTokens = nonNegativeCount(terminal.totalTokens);
+		const toolUses = nonNegativeCount(terminal.totalToolCalls);
+		const durationMs = nonNegativeCount(terminal.durationMs);
+		const usage = {
+			...totalTokens !== void 0 ? { totalTokens } : {},
+			...toolUses !== void 0 ? { toolUses } : {},
+			...durationMs !== void 0 ? { durationMs } : {}
+		};
+		return [{
+			...base,
+			type: "task.completed",
+			payload: {
+				...linkage,
+				status: event.type === "subagent.failed" ? "failed" : event.data.cancelled ? "stopped" : "completed",
+				...event.type === "subagent.failed" && event.data.error.trim() ? { summary: event.data.error.trim() } : {},
+				...Object.keys(usage).length > 0 ? { usage } : {},
+				...totalTokens !== void 0 ? { typedUsage: {
+					...usage,
+					totalTokens
+				} } : {}
+			}
+		}];
+	}
+	if (isCopilotChildEvent(event)) return [];
 	switch (event.type) {
 		case "assistant.turn_start": {
 			const eventTurnId = require_collectUint8StreamText.TurnId.make(event.data.turnId);
@@ -294,18 +354,40 @@ const mapEvent = (deps, session, event) => effect.Effect.gen(function* () {
 				data: event.data
 			}
 		}];
-		case "assistant.usage": return [{
-			...eventBase({
-				eventId: stamp.eventId,
-				createdAt: event.timestamp,
-				threadId: session.threadId,
-				providerInstanceId: session.providerInstanceId,
-				...turnId ? { turnId } : {},
-				raw
-			}),
-			type: "thread.token-usage.updated",
-			payload: { usage: normalizeUsage(event) }
-		}];
+		case "session.usage_info":
+		case "assistant.usage":
+			if (event.type === "session.usage_info") {
+				const { currentTokens, tokenLimit } = event.data;
+				if (!Number.isSafeInteger(currentTokens) || currentTokens < 0 || !Number.isSafeInteger(tokenLimit) || tokenLimit <= 0) return [];
+				session.contextUsage = {
+					usedTokens: currentTokens,
+					maxTokens: tokenLimit
+				};
+				session.lastUsage = {
+					...session.lastUsage,
+					...session.contextUsage,
+					lastUsedTokens: currentTokens
+				};
+			} else {
+				if (event.data.parentToolCallId || event.data.initiator || event.data.interactionType && !["conversation-agent", "conversation-user"].includes(event.data.interactionType)) return [];
+				session.lastUsage = {
+					...normalizeUsage(event),
+					...session.contextUsage,
+					...session.contextUsage ? { lastUsedTokens: session.contextUsage.usedTokens } : {}
+				};
+			}
+			return [{
+				...eventBase({
+					eventId: stamp.eventId,
+					createdAt: event.timestamp,
+					threadId: session.threadId,
+					providerInstanceId: session.providerInstanceId,
+					...turnId ? { turnId } : {},
+					raw
+				}),
+				type: "thread.token-usage.updated",
+				payload: { usage: session.lastUsage }
+			}];
 		case "session.idle": {
 			const readyEventId = yield* deps.nextEventId;
 			return [{
@@ -456,7 +538,7 @@ function parseResumeCursor(resumeCursor) {
 	return typeof resumeCursor === "object" && resumeCursor !== null && "sessionId" in resumeCursor && typeof resumeCursor.sessionId === "string" && resumeCursor.sessionId.trim().length > 0 ? resumeCursor.sessionId.trim() : void 0;
 }
 function attachmentMimeType(attachment) {
-	return attachment.mimeType;
+	return attachment.mimeType ?? "application/octet-stream";
 }
 function createTurnStartWaiter(record) {
 	let timeout;
@@ -614,8 +696,10 @@ const makeStartSession = (deps) => (input) => effect.Effect.gen(function* () {
 		attachSession: (nextSession) => {
 			record.unsubscribe();
 			record.session = nextSession;
+			delete record.contextUsage;
+			record.lastUsage = void 0;
 			record.unsubscribe = nextSession.on((event) => {
-				if (event.type === "assistant.turn_start") {
+				if (event.type === "assistant.turn_start" && !isCopilotChildEvent(event)) {
 					activeTurn = require_collectUint8StreamText.TurnId.make(event.data.turnId);
 					record.activeTurnId = activeTurn;
 					for (const pending of Array.from(record.pendingTurnStarts)) pending.resolve(activeTurn);
@@ -667,14 +751,19 @@ const makeStartSession = (deps) => (input) => effect.Effect.gen(function* () {
 }).pipe(effect.Effect.onError(() => effect.Effect.sync(() => deps.sessions.get(input.threadId)?.agentControl).pipe(effect.Effect.flatMap((connection) => connection ? connection.revoke("runtime-teardown") : effect.Effect.void))));
 const makeSendTurn = (deps) => (input) => effect.Effect.gen(function* () {
 	const record = yield* deps.requireSession(input.threadId);
-	const declaredAttachmentBytes = (input.attachments ?? []).reduce((total, attachment) => total + attachment.sizeBytes, 0);
+	const declaredAttachmentBytes = (input.attachments ?? []).reduce((total, attachment) => total + (attachment.sizeBytes ?? 0), 0);
 	if (declaredAttachmentBytes > 52428800) return yield* new require_bin.ProviderAdapterRequestError({
 		provider: COPILOT_DRIVER_KIND,
 		method: "session.send",
 		detail: `Attachments total ${declaredAttachmentBytes} bytes; limit is ${require_collectUint8StreamText.PROVIDER_SEND_TURN_MAX_ATTACHMENT_TOTAL_BYTES} bytes.`
 	});
 	let attachmentTotalBytes = 0;
-	const attachments = yield* effect.Effect.forEach(input.attachments ?? [], (attachment) => effect.Effect.gen(function* () {
+	const pathLineEntries = [];
+	const attachments = (yield* effect.Effect.forEach(input.attachments ?? [], (attachment) => effect.Effect.gen(function* () {
+		if (!require_bin.isPersistableChatAttachment(attachment)) {
+			pathLineEntries.push({ attachment });
+			return null;
+		}
 		const persisted = require_bin.readPersistedAttachment({
 			attachmentsDir: deps.serverConfig.attachmentsDir,
 			attachment
@@ -696,7 +785,7 @@ const makeSendTurn = (deps) => (input) => effect.Effect.gen(function* () {
 			mimeType: attachmentMimeType(attachment),
 			displayName: attachment.name
 		};
-	}));
+	}))).filter((attachment) => attachment !== null);
 	const copilotModelSelection = selectionTargetsCopilotInstance(input.modelSelection, deps.instanceId) ? input.modelSelection : void 0;
 	if (copilotModelSelection) {
 		record.model = copilotModelSelection.model;
@@ -723,7 +812,7 @@ const makeSendTurn = (deps) => (input) => effect.Effect.gen(function* () {
 	}
 	record.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
 	const sendPayload = {
-		prompt: input.input ?? "",
+		prompt: require_makeManagedServerProvider.appendAttachmentPathLines(input.input ?? "", require_makeManagedServerProvider.formatAttachmentPathLines(pathLineEntries)) ?? "",
 		...attachments.length > 0 ? { attachments } : {},
 		mode: "immediate"
 	};
@@ -913,6 +1002,15 @@ const makeCopilotAdapter = effect.Effect.fn("makeCopilotAdapter")(function* (cop
 		nextEventId
 	};
 	const handleEvent = effect.Effect.fn("handleCopilotEvent")(function* (session, event) {
+		if (isCopilotChildEvent(event)) {
+			yield* logNativeEvent(session.threadId, event);
+			const mapped = (yield* mapEvent(mapEventDeps, session, event)).map((runtimeEvent) => require_makeManagedServerProvider.stampRuntimeEvent(runtimeEvent, {
+				providerInstanceId: instanceId,
+				runtimeSessionId: session.runtimeSessionId
+			}));
+			if (mapped.length > 0) yield* emit(mapped);
+			return;
+		}
 		session.updatedAt = event.timestamp;
 		const clearsActiveTurn = event.type === "session.idle" || event.type === "abort";
 		if (event.type === "assistant.turn_start") {
@@ -927,7 +1025,6 @@ const makeCopilotAdapter = effect.Effect.fn("makeCopilotAdapter")(function* (cop
 			session.turns.at(-1)?.items.push(event);
 		} else if (event.type === "assistant.message_delta" || event.type === "assistant.reasoning" || event.type === "assistant.reasoning_delta" || event.type === "assistant.usage" || event.type === "tool.execution_start" || event.type === "tool.execution_complete" || event.type === "user_input.requested" || event.type === "user_input.completed") session.turns.at(-1)?.items.push(event);
 		else if (event.type === "session.idle" || event.type === "abort" || event.type === "assistant.turn_end" || event.type === "session.error") session.turns.at(-1)?.items.push(event);
-		if (event.type === "assistant.usage") session.lastUsage = normalizeUsage(event);
 		if (event.type === "session.error") {
 			session.lastError = event.data.message;
 			if (session.agentControl) yield* session.agentControl.revoke("runtime-teardown");
@@ -1265,11 +1362,13 @@ function mapCopilotModelCapabilities(model) {
 	})] });
 }
 function mapCopilotModel(model) {
+	const maxContextTokens = model.capabilities.limits?.max_context_window_tokens;
 	return {
 		slug: model.id,
 		name: model.name,
 		isCustom: false,
-		capabilities: mapCopilotModelCapabilities(model)
+		capabilities: mapCopilotModelCapabilities(model),
+		...Number.isSafeInteger(maxContextTokens) && maxContextTokens > 0 ? { maxContextTokens } : {}
 	};
 }
 function formatCopilotAuthLabel(authType) {

package/dist/{CopilotDriver-DZAW-7yV.mjs → CopilotDriver-ZvvsAIkd.mjs}

@@ -1,15 +1,21 @@
 #!/usr/bin/env node
 
-import { $o as RuntimeItemId, Ha as ProviderInstanceId, Ia as DEFAULT_GIT_TEXT_GENERATION_MODEL_BY_PROVIDER, Ko as EventId, La as DEFAULT_GIT_TEXT_GENERATION_OPTIONS_BY_PROVIDER, Pn as TextGenerationError, Qo as ProviderItemId, Va as ProviderDriverKind, bi as PROVIDER_SEND_TURN_MAX_ATTACHMENT_TOTAL_BYTES, er as CodexSettings, es as RuntimeRequestId, os as TurnId, tr as CopilotSettings } from "./collectUint8StreamText-D8TBiBWk.mjs";
+import { $a as ProviderInstanceId, Ja as DEFAULT_GIT_TEXT_GENERATION_OPTIONS_BY_PROVIDER, Ln as TextGenerationError, Qa as ProviderDriverKind, _s as TurnId, ds as RuntimeRequestId, ir as CopilotSettings, ki as PROVIDER_SEND_TURN_MAX_ATTACHMENT_TOTAL_BYTES, ls as ProviderItemId, ms as RuntimeTaskId, qa as DEFAULT_GIT_TEXT_GENERATION_MODEL_BY_PROVIDER, rr as CodexSettings, rs as EventId, us as RuntimeItemId } from "./collectUint8StreamText-C_VNyArd.mjs";
 import { st as ServerConfig } from "./Metrics-BP9YjxZB.mjs";
-import { $ as buildServerProvider, $n as getProviderOptionStringSelectionValue, B as sanitizeThreadTitle, F as buildThreadTitlePrompt, Fn as makeManualOnlyProviderMaintenanceCapabilities, Gn as resolveCommandPath, I as extractJsonObject, K as mergeProviderInstanceEnvironment, O as validateRankInboxThreadsResult, P as buildThreadPriorityPrompt, Q as buildSelectOptionDescriptor, T as makeEventNdjsonLogger, Un as readPersistedAttachment, Yn as getModelSelectionStringOptionValue, _t as ProviderAdapterValidationError, at as providerModelsFromSettings, ct as agentControlHostContext, dt as redactAgentControlSecrets, ft as createProcessDeviceToolBinding, gt as ProviderAdapterSessionNotFoundError, mt as ProviderAdapterRequestError, n as AgentControlSessionRegistry, nt as isCommandMissingCause, pt as ProviderAdapterProcessError, qn as createModelCapabilities, st as AGENT_CONTROL_INTERNAL_SERVER_NAME, t as makeServerQueueMetrics, ut as installAgentControlNativeHttp, vt as ProviderDriverError, w as ProviderEventLoggers } from "./bin.mjs";
-import { n as requireRuntimeSessionId, r as stampRuntimeEvent, t as makeManagedServerProvider } from "./makeManagedServerProvider-DRlNwlhe.mjs";
+import { $ as mergeProviderInstanceEnvironment, Ct as ProviderAdapterSessionNotFoundError, F as validateRankInboxThreadsResult, H as buildThreadTitlePrompt, M as makeEventNdjsonLogger, Qn as readPersistedAttachment, Tt as ProviderDriverError, U as extractJsonObject, Un as makeManualOnlyProviderMaintenanceCapabilities, V as buildThreadPriorityPrompt, Zn as isPersistableChatAttachment, _t as installAgentControlNativeHttp, at as buildSelectOptionDescriptor, bt as ProviderAdapterProcessError, cr as getProviderOptionStringSelectionValue, er as resolveCommandPath, ft as providerModelsFromSettings, ht as agentControlHostContext, ir as getModelSelectionStringOptionValue, j as ProviderEventLoggers, lt as isCommandMissingCause, mt as AGENT_CONTROL_INTERNAL_SERVER_NAME, n as AgentControlSessionRegistry, nr as createModelCapabilities, ot as buildServerProvider, q as sanitizeThreadTitle, t as makeServerQueueMetrics, vt as redactAgentControlSecrets, wt as ProviderAdapterValidationError, xt as ProviderAdapterRequestError, yt as createProcessDeviceToolBinding } from "./bin.mjs";
+import { a as formatAttachmentPathLines, i as appendAttachmentPathLines, n as requireRuntimeSessionId, r as stampRuntimeEvent, t as makeManagedServerProvider } from "./makeManagedServerProvider-GZcpSLrW.mjs";
 import { t as defaultProviderContinuationIdentity } from "./ProviderDriver-kCV60GKk.mjs";
-import { t as makeCodexTextGeneration } from "./CodexTextGeneration-BfGt7ZUe.mjs";
+import { t as makeCodexTextGeneration } from "./CodexTextGeneration-BikHow8k.mjs";
 import { Effect, Option, Queue, Result, Schema, Stream } from "effect";
 import { randomUUID } from "node:crypto";
 import "effect/unstable/process";
 import { CopilotClient, RuntimeConnection } from "@github/copilot-sdk";
+//#region src/provider/Layers/CopilotAdapter.eventScope.ts
+/** Wildcard SDK subscriptions include child events, including their turn and abort events. */
+function isCopilotChildEvent(event) {
+	return Boolean(event.agentId || "parentToolCallId" in event.data && event.data.parentToolCallId);
+}
+//#endregion
 //#region src/provider/Layers/CopilotAdapter.types.ts
 const COPILOT_DRIVER_KIND = ProviderDriverKind.make("copilot");
 const DEFAULT_BINARY_PATH = "copilot";
@@ -200,6 +206,9 @@ function selectionTargetsCopilotInstance(value, instanceId) {
 }
 //#endregion
 //#region src/provider/Layers/CopilotAdapter.mapEvent.ts
+function nonNegativeCount(value) {
+	return value !== void 0 && Number.isSafeInteger(value) && value >= 0 ? value : void 0;
+}
 const mapEvent = (deps, session, event) => Effect.gen(function* () {
 	const turnId = session.activeTurnId;
 	const stamp = yield* deps.makeEventStamp();
@@ -208,6 +217,57 @@ const mapEvent = (deps, session, event) => Effect.gen(function* () {
 		method: event.type,
 		payload: event
 	};
+	if (event.type === "subagent.started" || event.type === "subagent.completed" || event.type === "subagent.failed") {
+		const data = event.data;
+		const linkage = {
+			taskId: RuntimeTaskId.make(`copilot-task:${data.toolCallId}`),
+			taskType: "subagent",
+			title: data.agentDisplayName.trim() || data.agentName.trim() || "Copilot agent",
+			...data.agentName.trim() ? { role: data.agentName.trim() } : {},
+			...data.model?.trim() ? { model: data.model.trim() } : {},
+			toolUseId: data.toolCallId
+		};
+		const base = eventBase({
+			eventId: stamp.eventId,
+			createdAt: event.timestamp,
+			threadId: session.threadId,
+			providerInstanceId: session.providerInstanceId,
+			...turnId ? { turnId } : {},
+			raw
+		});
+		if (event.type === "subagent.started") return [{
+			...base,
+			type: "task.started",
+			payload: {
+				...linkage,
+				...event.data.agentDescription.trim() ? { description: event.data.agentDescription.trim() } : {}
+			}
+		}];
+		const terminal = event.data;
+		const totalTokens = nonNegativeCount(terminal.totalTokens);
+		const toolUses = nonNegativeCount(terminal.totalToolCalls);
+		const durationMs = nonNegativeCount(terminal.durationMs);
+		const usage = {
+			...totalTokens !== void 0 ? { totalTokens } : {},
+			...toolUses !== void 0 ? { toolUses } : {},
+			...durationMs !== void 0 ? { durationMs } : {}
+		};
+		return [{
+			...base,
+			type: "task.completed",
+			payload: {
+				...linkage,
+				status: event.type === "subagent.failed" ? "failed" : event.data.cancelled ? "stopped" : "completed",
+				...event.type === "subagent.failed" && event.data.error.trim() ? { summary: event.data.error.trim() } : {},
+				...Object.keys(usage).length > 0 ? { usage } : {},
+				...totalTokens !== void 0 ? { typedUsage: {
+					...usage,
+					totalTokens
+				} } : {}
+			}
+		}];
+	}
+	if (isCopilotChildEvent(event)) return [];
 	switch (event.type) {
 		case "assistant.turn_start": {
 			const eventTurnId = TurnId.make(event.data.turnId);
@@ -294,18 +354,40 @@ const mapEvent = (deps, session, event) => Effect.gen(function* () {
 				data: event.data
 			}
 		}];
-		case "assistant.usage": return [{
-			...eventBase({
-				eventId: stamp.eventId,
-				createdAt: event.timestamp,
-				threadId: session.threadId,
-				providerInstanceId: session.providerInstanceId,
-				...turnId ? { turnId } : {},
-				raw
-			}),
-			type: "thread.token-usage.updated",
-			payload: { usage: normalizeUsage(event) }
-		}];
+		case "session.usage_info":
+		case "assistant.usage":
+			if (event.type === "session.usage_info") {
+				const { currentTokens, tokenLimit } = event.data;
+				if (!Number.isSafeInteger(currentTokens) || currentTokens < 0 || !Number.isSafeInteger(tokenLimit) || tokenLimit <= 0) return [];
+				session.contextUsage = {
+					usedTokens: currentTokens,
+					maxTokens: tokenLimit
+				};
+				session.lastUsage = {
+					...session.lastUsage,
+					...session.contextUsage,
+					lastUsedTokens: currentTokens
+				};
+			} else {
+				if (event.data.parentToolCallId || event.data.initiator || event.data.interactionType && !["conversation-agent", "conversation-user"].includes(event.data.interactionType)) return [];
+				session.lastUsage = {
+					...normalizeUsage(event),
+					...session.contextUsage,
+					...session.contextUsage ? { lastUsedTokens: session.contextUsage.usedTokens } : {}
+				};
+			}
+			return [{
+				...eventBase({
+					eventId: stamp.eventId,
+					createdAt: event.timestamp,
+					threadId: session.threadId,
+					providerInstanceId: session.providerInstanceId,
+					...turnId ? { turnId } : {},
+					raw
+				}),
+				type: "thread.token-usage.updated",
+				payload: { usage: session.lastUsage }
+			}];
 		case "session.idle": {
 			const readyEventId = yield* deps.nextEventId;
 			return [{
@@ -456,7 +538,7 @@ function parseResumeCursor(resumeCursor) {
 	return typeof resumeCursor === "object" && resumeCursor !== null && "sessionId" in resumeCursor && typeof resumeCursor.sessionId === "string" && resumeCursor.sessionId.trim().length > 0 ? resumeCursor.sessionId.trim() : void 0;
 }
 function attachmentMimeType(attachment) {
-	return attachment.mimeType;
+	return attachment.mimeType ?? "application/octet-stream";
 }
 function createTurnStartWaiter(record) {
 	let timeout;
@@ -614,8 +696,10 @@ const makeStartSession = (deps) => (input) => Effect.gen(function* () {
 		attachSession: (nextSession) => {
 			record.unsubscribe();
 			record.session = nextSession;
+			delete record.contextUsage;
+			record.lastUsage = void 0;
 			record.unsubscribe = nextSession.on((event) => {
-				if (event.type === "assistant.turn_start") {
+				if (event.type === "assistant.turn_start" && !isCopilotChildEvent(event)) {
 					activeTurn = TurnId.make(event.data.turnId);
 					record.activeTurnId = activeTurn;
 					for (const pending of Array.from(record.pendingTurnStarts)) pending.resolve(activeTurn);
@@ -667,14 +751,19 @@ const makeStartSession = (deps) => (input) => Effect.gen(function* () {
 }).pipe(Effect.onError(() => Effect.sync(() => deps.sessions.get(input.threadId)?.agentControl).pipe(Effect.flatMap((connection) => connection ? connection.revoke("runtime-teardown") : Effect.void))));
 const makeSendTurn = (deps) => (input) => Effect.gen(function* () {
 	const record = yield* deps.requireSession(input.threadId);
-	const declaredAttachmentBytes = (input.attachments ?? []).reduce((total, attachment) => total + attachment.sizeBytes, 0);
+	const declaredAttachmentBytes = (input.attachments ?? []).reduce((total, attachment) => total + (attachment.sizeBytes ?? 0), 0);
 	if (declaredAttachmentBytes > 52428800) return yield* new ProviderAdapterRequestError({
 		provider: COPILOT_DRIVER_KIND,
 		method: "session.send",
 		detail: `Attachments total ${declaredAttachmentBytes} bytes; limit is ${PROVIDER_SEND_TURN_MAX_ATTACHMENT_TOTAL_BYTES} bytes.`
 	});
 	let attachmentTotalBytes = 0;
-	const attachments = yield* Effect.forEach(input.attachments ?? [], (attachment) => Effect.gen(function* () {
+	const pathLineEntries = [];
+	const attachments = (yield* Effect.forEach(input.attachments ?? [], (attachment) => Effect.gen(function* () {
+		if (!isPersistableChatAttachment(attachment)) {
+			pathLineEntries.push({ attachment });
+			return null;
+		}
 		const persisted = readPersistedAttachment({
 			attachmentsDir: deps.serverConfig.attachmentsDir,
 			attachment
@@ -696,7 +785,7 @@ const makeSendTurn = (deps) => (input) => Effect.gen(function* () {
 			mimeType: attachmentMimeType(attachment),
 			displayName: attachment.name
 		};
-	}));
+	}))).filter((attachment) => attachment !== null);
 	const copilotModelSelection = selectionTargetsCopilotInstance(input.modelSelection, deps.instanceId) ? input.modelSelection : void 0;
 	if (copilotModelSelection) {
 		record.model = copilotModelSelection.model;
@@ -723,7 +812,7 @@ const makeSendTurn = (deps) => (input) => Effect.gen(function* () {
 	}
 	record.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
 	const sendPayload = {
-		prompt: input.input ?? "",
+		prompt: appendAttachmentPathLines(input.input ?? "", formatAttachmentPathLines(pathLineEntries)) ?? "",
 		...attachments.length > 0 ? { attachments } : {},
 		mode: "immediate"
 	};
@@ -913,6 +1002,15 @@ const makeCopilotAdapter = Effect.fn("makeCopilotAdapter")(function* (copilotSet
 		nextEventId
 	};
 	const handleEvent = Effect.fn("handleCopilotEvent")(function* (session, event) {
+		if (isCopilotChildEvent(event)) {
+			yield* logNativeEvent(session.threadId, event);
+			const mapped = (yield* mapEvent(mapEventDeps, session, event)).map((runtimeEvent) => stampRuntimeEvent(runtimeEvent, {
+				providerInstanceId: instanceId,
+				runtimeSessionId: session.runtimeSessionId
+			}));
+			if (mapped.length > 0) yield* emit(mapped);
+			return;
+		}
 		session.updatedAt = event.timestamp;
 		const clearsActiveTurn = event.type === "session.idle" || event.type === "abort";
 		if (event.type === "assistant.turn_start") {
@@ -927,7 +1025,6 @@ const makeCopilotAdapter = Effect.fn("makeCopilotAdapter")(function* (copilotSet
 			session.turns.at(-1)?.items.push(event);
 		} else if (event.type === "assistant.message_delta" || event.type === "assistant.reasoning" || event.type === "assistant.reasoning_delta" || event.type === "assistant.usage" || event.type === "tool.execution_start" || event.type === "tool.execution_complete" || event.type === "user_input.requested" || event.type === "user_input.completed") session.turns.at(-1)?.items.push(event);
 		else if (event.type === "session.idle" || event.type === "abort" || event.type === "assistant.turn_end" || event.type === "session.error") session.turns.at(-1)?.items.push(event);
-		if (event.type === "assistant.usage") session.lastUsage = normalizeUsage(event);
 		if (event.type === "session.error") {
 			session.lastError = event.data.message;
 			if (session.agentControl) yield* session.agentControl.revoke("runtime-teardown");
@@ -1265,11 +1362,13 @@ function mapCopilotModelCapabilities(model) {
 	})] });
 }
 function mapCopilotModel(model) {
+	const maxContextTokens = model.capabilities.limits?.max_context_window_tokens;
 	return {
 		slug: model.id,
 		name: model.name,
 		isCustom: false,
-		capabilities: mapCopilotModelCapabilities(model)
+		capabilities: mapCopilotModelCapabilities(model),
+		...Number.isSafeInteger(maxContextTokens) && maxContextTokens > 0 ? { maxContextTokens } : {}
 	};
 }
 function formatCopilotAuthLabel(authType) {

package/dist/{CursorDriver-B4jb4rWd.mjs → CursorDriver-B1QSBzuH.mjs}

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 
-import { Ha as ProviderInstanceId, Ko as EventId, Pn as TextGenerationError, Ro as ApprovalRequestId, Va as ProviderDriverKind, es as RuntimeRequestId, nr as CursorSettings, os as TurnId } from "./collectUint8StreamText-D8TBiBWk.mjs";
+import { $a as ProviderInstanceId, Ln as TextGenerationError, Qa as ProviderDriverKind, Yo as ApprovalRequestId, _s as TurnId, ar as CursorSettings, ds as RuntimeRequestId, rs as EventId } from "./collectUint8StreamText-C_VNyArd.mjs";
 import { nt as sanitizeFeatureBranchName, st as ServerConfig, tt as sanitizeBranchFragment } from "./Metrics-BP9YjxZB.mjs";
-import { $ as buildServerProvider, $n as getProviderOptionStringSelectionValue, A as buildCommitMessagePrompt, B as sanitizeThreadTitle, Bn as resolveProviderMaintenanceCapabilitiesEffect, F as buildThreadTitlePrompt, Hn as ServerSettingsService, I as extractJsonObject, K as mergeProviderInstanceEnvironment, Ln as makeProviderMaintenanceCapabilities, M as buildIssueContentTitlePrompt, N as buildPrContentPrompt, O as validateRankInboxThreadsResult, P as buildThreadPriorityPrompt, Pn as enrichProviderSnapshotWithVersionAdvisory, Q as buildSelectOptionDescriptor, R as sanitizeCommitSubject, Rn as makeStaticProviderMaintenanceResolver, T as makeEventNdjsonLogger, Wn as resolveAttachmentPath, Xn as getProviderOptionBooleanSelectionValue, Z as buildBooleanOptionDescriptor, _t as ProviderAdapterValidationError, at as providerModelsFromSettings, ct as agentControlHostContext, et as collectStreamAsString, ft as createProcessDeviceToolBinding, gt as ProviderAdapterSessionNotFoundError, j as buildIssueContentPolishPrompt, k as buildBranchNamePrompt, lt as installAgentControlAcp, mt as ProviderAdapterRequestError, n as AgentControlSessionRegistry, nt as isCommandMissingCause, pt as ProviderAdapterProcessError, qn as createModelCapabilities, vt as ProviderDriverError, w as ProviderEventLoggers, z as sanitizePrTitle } from "./bin.mjs";
-import { n as requireRuntimeSessionId, r as stampRuntimeEvent, t as makeManagedServerProvider } from "./makeManagedServerProvider-DRlNwlhe.mjs";
+import { $ as mergeProviderInstanceEnvironment, $n as resolveAttachmentPath, B as buildPrContentPrompt, Ct as ProviderAdapterSessionNotFoundError, F as validateRankInboxThreadsResult, G as sanitizeCommitSubject, Gn as makeProviderMaintenanceCapabilities, H as buildThreadTitlePrompt, Hn as enrichProviderSnapshotWithVersionAdvisory, I as buildBranchNamePrompt, Jn as resolveProviderMaintenanceCapabilitiesEffect, K as sanitizePrTitle, Kn as makeStaticProviderMaintenanceResolver, L as buildCommitMessagePrompt, M as makeEventNdjsonLogger, R as buildIssueContentPolishPrompt, Tt as ProviderDriverError, U as extractJsonObject, V as buildThreadPriorityPrompt, Xn as ServerSettingsService, Zn as isPersistableChatAttachment, ar as getProviderOptionBooleanSelectionValue, at as buildSelectOptionDescriptor, bt as ProviderAdapterProcessError, cr as getProviderOptionStringSelectionValue, ft as providerModelsFromSettings, gt as installAgentControlAcp, ht as agentControlHostContext, it as buildBooleanOptionDescriptor, j as ProviderEventLoggers, lt as isCommandMissingCause, n as AgentControlSessionRegistry, nr as createModelCapabilities, ot as buildServerProvider, q as sanitizeThreadTitle, st as collectStreamAsString, wt as ProviderAdapterValidationError, xt as ProviderAdapterRequestError, yt as createProcessDeviceToolBinding, z as buildIssueContentTitlePrompt } from "./bin.mjs";
+import { a as formatAttachmentPathLines, i as appendAttachmentPathLines, n as requireRuntimeSessionId, r as stampRuntimeEvent, t as makeManagedServerProvider } from "./makeManagedServerProvider-GZcpSLrW.mjs";
 import { t as defaultProviderContinuationIdentity } from "./ProviderDriver-kCV60GKk.mjs";
-import { a as makeAcpRequestOpenedEvent, c as makeAcpTokenUsageEvent, d as mapAcpToAdapterError, f as AcpSessionRuntime, h as SessionConfigOption, i as makeAcpPlanUpdatedEvent, l as makeAcpToolCallEvent, n as makeAcpAssistantItemEvent, o as makeAcpRequestResolvedEvent, p as parsePermissionRequest, r as makeAcpContentDeltaEvent, s as makeAcpThoughtDeltaEvent, t as makeAcpNativeLoggers, u as acpPermissionOutcome } from "./AcpNativeLogging-Ch-s9nA8.mjs";
+import { a as makeAcpRequestOpenedEvent, c as makeAcpTokenUsageEvent, d as mapAcpToAdapterError, f as makeAcpSubagentRuntimeEvents, g as SessionConfigOption, i as makeAcpPlanUpdatedEvent, l as makeAcpToolCallEvent, m as parsePermissionRequest, n as makeAcpAssistantItemEvent, o as makeAcpRequestResolvedEvent, p as AcpSessionRuntime, r as makeAcpContentDeltaEvent, s as makeAcpThoughtDeltaEvent, t as makeAcpNativeLoggers, u as acpPermissionOutcome } from "./AcpNativeLogging-D7e1dn7s.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";
@@ -1033,66 +1033,6 @@ function makeCursorAdapter(cursorSettings, options) {
 				runtimeSessionId
 			})).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* offerRuntimeEventForRuntime(ctx.session.runtimeSessionId, {
-					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* offerRuntimeEventForRuntime(ctx.session.runtimeSessionId, {
-					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* offerRuntimeEventForRuntime(ctx.session.runtimeSessionId, {
-				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, {
@@ -1391,8 +1331,7 @@ function makeCursorAdapter(cursorSettings, options) {
 				pendingApprovals,
 				pendingUserInputs,
 				turns: [],
-				startedSubagentIds: /* @__PURE__ */ new Set(),
-				completedSubagentIds: /* @__PURE__ */ new Set(),
+				subagentEvents: makeAcpSubagentRuntimeEvents(),
 				lastPlanFingerprint: void 0,
 				activeTurnId: void 0,
 				stopped: false
@@ -1434,7 +1373,14 @@ function makeCursorAdapter(cursorSettings, options) {
 							toolCall: event.toolCall,
 							rawPayload: event.rawPayload
 						}));
-						yield* offerAcpSubagentRuntimeEvents(ctx, event.toolCall.subagent, event.rawPayload);
+						for (const subagentEvent of yield* ctx.subagentEvents({
+							provider: PROVIDER,
+							threadId: ctx.threadId,
+							turnId: ctx.activeTurnId,
+							state: event.toolCall.subagent,
+							rawPayload: event.rawPayload,
+							makeStamp: makeEventStamp
+						})) yield* offerRuntimeEventForRuntime(runtimeSessionId, subagentEvent);
 						return;
 					case "ContentDelta":
 						yield* logNative(ctx.threadId, "session/update", event.rawPayload, "acp.jsonrpc");
@@ -1540,11 +1486,19 @@ function makeCursorAdapter(cursorSettings, options) {
 				});
 				ctx.agentControlHostContextDelivered = true;
 			}
-			if (input.input?.trim()) promptParts.push({
-				type: "text",
-				text: input.input.trim()
-			});
-			if (input.attachments && input.attachments.length > 0) for (const attachment of input.attachments) {
+			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
@@ -1560,13 +1514,19 @@ function makeCursorAdapter(cursorSettings, options) {
 					detail: cause.message,
 					cause
 				})));
-				promptParts.push({
+				imageParts.push({
 					type: "image",
 					data: Buffer.from(bytes).toString("base64"),
 					mimeType: attachment.mimeType
 				});
 			}
-			if (!input.input?.trim() && (!input.attachments || input.attachments.length === 0)) return yield* new ProviderAdapterValidationError({
+			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."