ryco-cli 0.1.21 → 0.1.23

package/dist/{CursorDriver-B4jb4rWd.mjs → CursorDriver-CNo9Uzo8.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 { 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 { $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-a1h4iBQi.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."

package/dist/{ForgejoSourceControlProvider-Dfi8KH7I.mjs → ForgejoSourceControlProvider-BGXysSX6.mjs}

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
-import { Ca as SourceControlProviderError, Ta as truncateSourceControlDetailContent } from "./collectUint8StreamText-D8TBiBWk.mjs";
-import { a as makeForgejoDiscovery, l as sourceControlRefFromInput, o as SourceControlProvider } from "./SourceControlProviderDiscoveryCatalog-DaRgCE5d.mjs";
-import { jn as ForgejoApi } from "./bin.mjs";
+import { Ia as truncateSourceControlDetailContent, Pa as SourceControlProviderError } from "./collectUint8StreamText-C_VNyArd.mjs";
+import { a as makeForgejoDiscovery, l as sourceControlRefFromInput, o as SourceControlProvider } from "./SourceControlProviderDiscoveryCatalog-B37RHe2u.mjs";
+import { zn as ForgejoApi } from "./bin.mjs";
 import { DateTime, Effect, Layer, Option } from "effect";
 //#region src/sourceControl/ForgejoSourceControlProvider.ts
 function providerError(operation, cause) {

package/dist/{ForgejoSourceControlProvider-CXUevO6C.cjs → ForgejoSourceControlProvider-Dh6DOoc8.cjs}

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

package/dist/{GitHubSourceControlProvider-DOs1ouvp.cjs → GitHubSourceControlProvider-8hsv_kCE.cjs}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-const require_collectUint8StreamText = require("./collectUint8StreamText-C5fop6Zf.cjs");
-const require_SourceControlProviderDiscoveryCatalog = require("./SourceControlProviderDiscoveryCatalog-DCmYsPEa.cjs");
+const require_collectUint8StreamText = require("./collectUint8StreamText-DStwNTTK.cjs");
+const require_SourceControlProviderDiscoveryCatalog = require("./SourceControlProviderDiscoveryCatalog-DreaAH1H.cjs");
 const require_sourceControl = require("./sourceControl-B0D1Op29.cjs");
 const require_bin = require("./bin.cjs");
 let effect = require("effect");

package/dist/{GitHubSourceControlProvider-BH97aNa0.mjs → GitHubSourceControlProvider-CPCYV8Xo.mjs}

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
-import { Ca as SourceControlProviderError, Sa as SOURCE_CONTROL_WORKFLOW_LOG_MAX_BYTES, Ta as truncateSourceControlDetailContent } from "./collectUint8StreamText-D8TBiBWk.mjs";
-import { n as githubDiscovery, o as SourceControlProvider } from "./SourceControlProviderDiscoveryCatalog-DaRgCE5d.mjs";
+import { Ia as truncateSourceControlDetailContent, Na as SOURCE_CONTROL_WORKFLOW_LOG_MAX_BYTES, Pa as SourceControlProviderError } from "./collectUint8StreamText-C_VNyArd.mjs";
+import { n as githubDiscovery, o as SourceControlProvider } from "./SourceControlProviderDiscoveryCatalog-B37RHe2u.mjs";
 import { a as parseGitHubRepositoryOwnerFromUrl, i as parseGitHubRepositoryIdentityFromUrl, t as classifySourceControlCommentAuthorRole } from "./sourceControl-BiEBxN01.mjs";
-import { An as decodeGitHubPullRequestListJson, Dn as formatGitHubJsonFields, En as GitHubCliError, On as isStatusCheckRollupAccessError, Tn as GitHubCli, kn as withoutStatusCheckRollupJsonField, wn as GITHUB_PULL_REQUEST_LIST_JSON_FIELDS } from "./bin.mjs";
+import { Fn as formatGitHubJsonFields, In as isStatusCheckRollupAccessError, Ln as withoutStatusCheckRollupJsonField, Mn as GITHUB_PULL_REQUEST_LIST_JSON_FIELDS, Nn as GitHubCli, Pn as GitHubCliError, Rn as decodeGitHubPullRequestListJson } 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/{GitLabSourceControlProvider-CfbE6GYD.cjs → GitLabSourceControlProvider-B0ZbF9Zx.cjs}

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

package/dist/{GitLabSourceControlProvider-nIzcy9AJ.mjs → GitLabSourceControlProvider-Bvknpaon.mjs}

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
-import { Ca as SourceControlProviderError, Ta as truncateSourceControlDetailContent } from "./collectUint8StreamText-D8TBiBWk.mjs";
-import { l as sourceControlRefFromInput, o as SourceControlProvider, r as gitlabDiscovery } from "./SourceControlProviderDiscoveryCatalog-DaRgCE5d.mjs";
-import { Cn as GitLabCli } from "./bin.mjs";
+import { Ia as truncateSourceControlDetailContent, Pa as SourceControlProviderError } from "./collectUint8StreamText-C_VNyArd.mjs";
+import { l as sourceControlRefFromInput, o as SourceControlProvider, r as gitlabDiscovery } from "./SourceControlProviderDiscoveryCatalog-B37RHe2u.mjs";
+import { jn as GitLabCli } from "./bin.mjs";
 import { DateTime, Effect, Layer, Option } from "effect";
 //#region src/sourceControl/GitLabSourceControlProvider.ts
 function providerError(operation, cause) {

package/dist/{GrokDriver-CENrrqQc.mjs → GrokDriver-DSPEmiwq.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, ir as GrokSettings, os as TurnId } from "./collectUint8StreamText-D8TBiBWk.mjs";
-import { nt as sanitizeFeatureBranchName, st as ServerConfig, tt as sanitizeBranchFragment } from "./Metrics-BP9YjxZB.mjs";
-import { $ as buildServerProvider, A as buildCommitMessagePrompt, B as sanitizeThreadTitle, Bn as resolveProviderMaintenanceCapabilitiesEffect, F as buildThreadTitlePrompt, Fn as makeManualOnlyProviderMaintenanceCapabilities, Hn as ServerSettingsService, I as extractJsonObject, K as mergeProviderInstanceEnvironment, M as buildIssueContentTitlePrompt, N as buildPrContentPrompt, O as validateRankInboxThreadsResult, P as buildThreadPriorityPrompt, Pn as enrichProviderSnapshotWithVersionAdvisory, R as sanitizeCommitSubject, Rn as makeStaticProviderMaintenanceResolver, T as makeEventNdjsonLogger, Wn as resolveAttachmentPath, _t as ProviderAdapterValidationError, at as providerModelsFromSettings, er as normalizeModelSlug, ft as createProcessDeviceToolBinding, gt as ProviderAdapterSessionNotFoundError, it as parseGenericCliVersion, j as buildIssueContentPolishPrompt, k as buildBranchNamePrompt, mt as ProviderAdapterRequestError, nt as isCommandMissingCause, ot as spawnAndCollect, 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 { $a as ProviderInstanceId, Ln as TextGenerationError, Qa as ProviderDriverKind, Yo as ApprovalRequestId, _s as TurnId, ds as RuntimeRequestId, rs as EventId, sr as GrokSettings } from "./collectUint8StreamText-C_VNyArd.mjs";
+import { nt as sanitizeFeatureBranchName, st as ServerConfig, tt as sanitizeBranchFragment } from "./Metrics-a1h4iBQi.mjs";
+import { $ as mergeProviderInstanceEnvironment, $n as resolveAttachmentPath, B as buildPrContentPrompt, Ct as ProviderAdapterSessionNotFoundError, F as validateRankInboxThreadsResult, G as sanitizeCommitSubject, 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, Un as makeManualOnlyProviderMaintenanceCapabilities, V as buildThreadPriorityPrompt, Xn as ServerSettingsService, Zn as isPersistableChatAttachment, bt as ProviderAdapterProcessError, dt as parseGenericCliVersion, ft as providerModelsFromSettings, j as ProviderEventLoggers, lr as normalizeModelSlug, lt as isCommandMissingCause, nr as createModelCapabilities, ot as buildServerProvider, pt as spawnAndCollect, q as sanitizeThreadTitle, 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, i as makeAcpPlanUpdatedEvent, l as makeAcpToolCallEvent, m as AcpTransportError, n as makeAcpAssistantItemEvent, o as makeAcpRequestResolvedEvent, p as parsePermissionRequest, r as makeAcpContentDeltaEvent, s as makeAcpThoughtDeltaEvent, t as makeAcpNativeLoggers } from "./AcpNativeLogging-Ch-s9nA8.mjs";
+import { a as makeAcpRequestOpenedEvent, c as makeAcpTokenUsageEvent, d as mapAcpToAdapterError, f as makeAcpSubagentRuntimeEvents, h as AcpTransportError, 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 } from "./AcpNativeLogging-D7e1dn7s.mjs";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Schema from "effect/Schema";
@@ -15,14 +15,14 @@ import * as Semaphore from "effect/Semaphore";
 import * as Scope from "effect/Scope";
 import * as Cause from "effect/Cause";
 import * as Deferred from "effect/Deferred";
+import * as Exit from "effect/Exit";
+import * as Option from "effect/Option";
 import * as Ref from "effect/Ref";
 import * as Stream from "effect/Stream";
 import * as Duration from "effect/Duration";
 import * as Fiber from "effect/Fiber";
 import * as FileSystem from "effect/FileSystem";
 import * as Path from "effect/Path";
-import * as Option from "effect/Option";
-import * as Exit from "effect/Exit";
 import * as DateTime from "effect/DateTime";
 import * as PubSub from "effect/PubSub";
 import * as SynchronizedRef from "effect/SynchronizedRef";
@@ -841,6 +841,7 @@ function makeGrokAdapter(grokSettings, options) {
 				updatedAt: now
 			};
 			ctx = {
+				subagentEvents: makeAcpSubagentRuntimeEvents(),
 				threadId: input.threadId,
 				acpSessionId: started.sessionId,
 				session,
@@ -891,6 +892,14 @@ function makeGrokAdapter(grokSettings, options) {
 							toolCall: event.toolCall,
 							rawPayload: event.rawPayload
 						}));
+						for (const subagentEvent of yield* ctx.subagentEvents({
+							provider: PROVIDER$1,
+							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);
@@ -969,8 +978,18 @@ function makeGrokAdapter(grokSettings, options) {
 					requestedModelId: requestedTurnModelId,
 					mapError: (cause) => mapAcpToAdapterError(PROVIDER$1, input.threadId, "session/set_model", cause)
 				});
-				const text = input.input?.trim();
+				const pathLineEntries = [];
 				const imagePromptParts = yield* Effect.forEach(input.attachments ?? [], (attachment) => Effect.gen(function* () {
+					if (!isPersistableChatAttachment(attachment) || attachment.type !== "image") {
+						pathLineEntries.push({
+							attachment,
+							...attachment.id === void 0 ? {} : { resolvedPath: resolveAttachmentPath({
+								attachmentsDir: serverConfig.attachmentsDir,
+								attachment
+							}) ?? void 0 }
+						});
+						return null;
+					}
 					const attachmentPath = resolveAttachmentPath({
 						attachmentsDir: serverConfig.attachmentsDir,
 						attachment
@@ -992,10 +1011,11 @@ function makeGrokAdapter(grokSettings, options) {
 						mimeType: attachment.mimeType
 					};
 				}));
-				const promptParts = [...text ? [{
+				const promptText = appendAttachmentPathLines(input.input?.trim(), formatAttachmentPathLines(pathLineEntries));
+				const promptParts = [...promptText && promptText.trim().length > 0 ? [{
 					type: "text",
-					text
-				}] : [], ...imagePromptParts];
+					text: promptText
+				}] : [], ...imagePromptParts.filter((part) => part !== null)];
 				if (promptParts.length === 0) return yield* new ProviderAdapterValidationError({
 					provider: PROVIDER$1,
 					operation: "sendTurn",

package/dist/{GrokDriver-C35gWEiw.cjs → GrokDriver-RyyFeh_q.cjs}

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 
 const require_rolldown_runtime = require("./rolldown-runtime-LGfotAqq.cjs");
-const require_collectUint8StreamText = require("./collectUint8StreamText-C5fop6Zf.cjs");
-const require_Metrics = require("./Metrics-DIjMQ5pa.cjs");
+const require_collectUint8StreamText = require("./collectUint8StreamText-DStwNTTK.cjs");
+const require_Metrics = require("./Metrics-Bcb9vCAe.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_AcpNativeLogging = require("./AcpNativeLogging-D54V5cIY.cjs");
+const require_AcpNativeLogging = require("./AcpNativeLogging-COepku4a.cjs");
 let effect_Effect = require("effect/Effect");
 effect_Effect = require_rolldown_runtime.__toESM(effect_Effect, 1);
 let effect_Layer = require("effect/Layer");
@@ -23,6 +23,10 @@ let effect_Cause = require("effect/Cause");
 effect_Cause = require_rolldown_runtime.__toESM(effect_Cause, 1);
 let effect_Deferred = require("effect/Deferred");
 effect_Deferred = require_rolldown_runtime.__toESM(effect_Deferred, 1);
+let effect_Exit = require("effect/Exit");
+effect_Exit = require_rolldown_runtime.__toESM(effect_Exit, 1);
+let effect_Option = require("effect/Option");
+effect_Option = require_rolldown_runtime.__toESM(effect_Option, 1);
 let effect_Ref = require("effect/Ref");
 effect_Ref = require_rolldown_runtime.__toESM(effect_Ref, 1);
 let effect_Stream = require("effect/Stream");
@@ -35,10 +39,6 @@ let effect_FileSystem = require("effect/FileSystem");
 effect_FileSystem = require_rolldown_runtime.__toESM(effect_FileSystem, 1);
 let effect_Path = require("effect/Path");
 effect_Path = require_rolldown_runtime.__toESM(effect_Path, 1);
-let effect_Option = require("effect/Option");
-effect_Option = require_rolldown_runtime.__toESM(effect_Option, 1);
-let effect_Exit = require("effect/Exit");
-effect_Exit = require_rolldown_runtime.__toESM(effect_Exit, 1);
 let effect_DateTime = require("effect/DateTime");
 effect_DateTime = require_rolldown_runtime.__toESM(effect_DateTime, 1);
 let effect_PubSub = require("effect/PubSub");
@@ -861,6 +861,7 @@ function makeGrokAdapter(grokSettings, options) {
 				updatedAt: now
 			};
 			ctx = {
+				subagentEvents: require_AcpNativeLogging.makeAcpSubagentRuntimeEvents(),
 				threadId: input.threadId,
 				acpSessionId: started.sessionId,
 				session,
@@ -911,6 +912,14 @@ function makeGrokAdapter(grokSettings, options) {
 							toolCall: event.toolCall,
 							rawPayload: event.rawPayload
 						}));
+						for (const subagentEvent of yield* ctx.subagentEvents({
+							provider: PROVIDER$1,
+							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);
@@ -989,8 +998,18 @@ function makeGrokAdapter(grokSettings, options) {
 					requestedModelId: requestedTurnModelId,
 					mapError: (cause) => require_AcpNativeLogging.mapAcpToAdapterError(PROVIDER$1, input.threadId, "session/set_model", cause)
 				});
-				const text = input.input?.trim();
+				const pathLineEntries = [];
 				const imagePromptParts = yield* effect_Effect.forEach(input.attachments ?? [], (attachment) => effect_Effect.gen(function* () {
+					if (!require_bin.isPersistableChatAttachment(attachment) || attachment.type !== "image") {
+						pathLineEntries.push({
+							attachment,
+							...attachment.id === void 0 ? {} : { resolvedPath: require_bin.resolveAttachmentPath({
+								attachmentsDir: serverConfig.attachmentsDir,
+								attachment
+							}) ?? void 0 }
+						});
+						return null;
+					}
 					const attachmentPath = require_bin.resolveAttachmentPath({
 						attachmentsDir: serverConfig.attachmentsDir,
 						attachment
@@ -1012,10 +1031,11 @@ function makeGrokAdapter(grokSettings, options) {
 						mimeType: attachment.mimeType
 					};
 				}));
-				const promptParts = [...text ? [{
+				const promptText = require_makeManagedServerProvider.appendAttachmentPathLines(input.input?.trim(), require_makeManagedServerProvider.formatAttachmentPathLines(pathLineEntries));
+				const promptParts = [...promptText && promptText.trim().length > 0 ? [{
 					type: "text",
-					text
-				}] : [], ...imagePromptParts];
+					text: promptText
+				}] : [], ...imagePromptParts.filter((part) => part !== null)];
 				if (promptParts.length === 0) return yield* new require_bin.ProviderAdapterValidationError({
 					provider: PROVIDER$1,
 					operation: "sendTurn",

package/dist/{Metrics-DIjMQ5pa.cjs → Metrics-Bcb9vCAe.cjs}

@@ -11,7 +11,7 @@ let node_crypto = require("node:crypto");
 let effect_Function = require("effect/Function");
 let effect_Random = require("effect/Random");
 effect_Random = require_rolldown_runtime.__toESM(effect_Random, 1);
-//#region ../../node_modules/.bun/cborg@6.1.1/node_modules/cborg/lib/is.js
+//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/is.js
 const objectTypeNames = [
 	"Object",
 	"RegExp",
@@ -66,7 +66,7 @@ function getObjectType(value) {
 	if (objectTypeNames.includes(objectTypeName)) return objectTypeName;
 }
 //#endregion
-//#region ../../node_modules/.bun/cborg@6.1.1/node_modules/cborg/lib/token.js
+//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/token.js
 var Type = class {
 	/**
 	* @param {number} major
@@ -134,7 +134,7 @@ var Token = class {
 	}
 };
 //#endregion
-//#region ../../node_modules/.bun/cborg@6.1.1/node_modules/cborg/lib/byte-utils.js
+//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/byte-utils.js
 const useBuffer = globalThis.process && !globalThis.process.browser && globalThis.Buffer && typeof globalThis.Buffer.isBuffer === "function";
 const textEncoder = new TextEncoder();
 /**
@@ -258,7 +258,7 @@ function utf8ToBytes(str) {
 	return out;
 }
 //#endregion
-//#region ../../node_modules/.bun/cborg@6.1.1/node_modules/cborg/lib/bl.js
+//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/bl.js
 /**
 * Bl is a list of byte chunks, similar to https://github.com/rvagg/bl but for
 * writing rather than reading.
@@ -411,7 +411,7 @@ var U8Bl = class {
 	}
 };
 //#endregion
-//#region ../../node_modules/.bun/cborg@6.1.1/node_modules/cborg/lib/common.js
+//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/common.js
 const decodeErrPrefix = "CBOR decode error:";
 const encodeErrPrefix = "CBOR encode error:";
 const uintMinorPrefixBytes = [];
@@ -429,7 +429,7 @@ function assertEnoughData(data, pos, need) {
 	if (data.length - pos < need) throw new Error(`${decodeErrPrefix} not enough data for type`);
 }
 //#endregion
-//#region ../../node_modules/.bun/cborg@6.1.1/node_modules/cborg/lib/0uint.js
+//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/0uint.js
 const uintBoundaries = [
 	24,
 	256,
@@ -628,7 +628,7 @@ encodeUint.compareTokens = function compareTokens(tok1, tok2) {
 	return tok1.value < tok2.value ? -1 : tok1.value > tok2.value ? 1 : 0;
 };
 //#endregion
-//#region ../../node_modules/.bun/cborg@6.1.1/node_modules/cborg/lib/1negint.js
+//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/1negint.js
 /**
 * @typedef {import('../interface.js').ByteWriter} ByteWriter
 * @typedef {import('../interface.js').DecodeOptions} DecodeOptions
@@ -712,7 +712,7 @@ encodeNegint.compareTokens = function compareTokens(tok1, tok2) {
 	return tok1.value < tok2.value ? 1 : tok1.value > tok2.value ? -1 : 0;
 };
 //#endregion
-//#region ../../node_modules/.bun/cborg@6.1.1/node_modules/cborg/lib/2bytes.js
+//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/2bytes.js
 /**
 * @typedef {import('../interface.js').ByteWriter} ByteWriter
 * @typedef {import('../interface.js').DecodeOptions} DecodeOptions
@@ -825,7 +825,7 @@ function compareBytes(b1, b2) {
 	return b1.length < b2.length ? -1 : b1.length > b2.length ? 1 : compare(b1, b2);
 }
 //#endregion
-//#region ../../node_modules/.bun/cborg@6.1.1/node_modules/cborg/lib/3string.js
+//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/3string.js
 const textDecoder = new TextDecoder();
 const ASCII_THRESHOLD = 32;
 /**
@@ -921,7 +921,7 @@ function decodeString64(data, pos, _minor, options) {
 }
 const encodeString = encodeBytes;
 //#endregion
-//#region ../../node_modules/.bun/cborg@6.1.1/node_modules/cborg/lib/4array.js
+//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/4array.js
 /**
 * @typedef {import('../interface.js').ByteWriter} ByteWriter
 * @typedef {import('../interface.js').DecodeOptions} DecodeOptions
@@ -1015,7 +1015,7 @@ encodeArray.encodedSize = function encodedSize(token) {
 	return encodeUintValue.encodedSize(token.value);
 };
 //#endregion
-//#region ../../node_modules/.bun/cborg@6.1.1/node_modules/cborg/lib/5map.js
+//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/5map.js
 /**
 * @typedef {import('../interface.js').ByteWriter} ByteWriter
 * @typedef {import('../interface.js').DecodeOptions} DecodeOptions
@@ -1109,7 +1109,7 @@ encodeMap.encodedSize = function encodedSize(token) {
 	return encodeUintValue.encodedSize(token.value);
 };
 //#endregion
-//#region ../../node_modules/.bun/cborg@6.1.1/node_modules/cborg/lib/6tag.js
+//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/6tag.js
 /**
 * @typedef {import('../interface.js').ByteWriter} ByteWriter
 * @typedef {import('../interface.js').DecodeOptions} DecodeOptions
@@ -1451,7 +1451,7 @@ encodeFloat.compareTokens = function compareTokens(tok1, tok2, options) {
 	return compare(b1, b2);
 };
 //#endregion
-//#region ../../node_modules/.bun/cborg@6.1.1/node_modules/cborg/lib/jump.js
+//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/jump.js
 /**
 * @typedef {import('../interface.js').DecodeOptions} DecodeOptions
 * @typedef {import('../interface.js').AllocatedByteView} AllocatedByteView
@@ -1590,7 +1590,7 @@ function quickEncodeToken(token) {
 	}
 }
 //#endregion
-//#region ../../node_modules/.bun/cborg@6.1.1/node_modules/cborg/lib/encode.js
+//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/encode.js
 /**
 * @typedef {import('../interface.js').EncodeOptions} EncodeOptions
 * @typedef {import('../interface.js').OptionalTypeEncoder} OptionalTypeEncoder
@@ -2116,7 +2116,7 @@ function encode(data, options) {
 	return encodeCustom(data, cborEncoders, options);
 }
 //#endregion
-//#region ../../node_modules/.bun/cborg@6.1.1/node_modules/cborg/lib/decode.js
+//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/decode.js
 /**
 * @typedef {import('./token.js').Token} Token
 * @typedef {import('../interface.js').DecodeOptions} DecodeOptions
@@ -2207,6 +2207,12 @@ function tokenToMap(token, tokeniser, options) {
 		const value = tokensToObject(tokeniser, options);
 		if (value === DONE) throw new Error(`${decodeErrPrefix} found map but not enough entries (got ${i} [no value], expected ${token.value})`);
 		if (useMaps) m.set(key, value);
+		else if (key === "__proto__") Object.defineProperty(obj, key, {
+			value,
+			configurable: true,
+			enumerable: true,
+			writable: true
+		});
 		else obj[key] = value;
 	}
 	return useMaps ? m : obj;