@xiaoso/dsh-tool-plus 0.1.6 → 0.1.7-beta.1

package/lib/{cursor-CRpLpaZ3.mjs → cursor-DJV_dcgB.mjs}

@@ -1,1678 +1,110 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
 import { n as fs_promises_shim_exports } from "./fs-promises-shim-Bx0fpxuk.mjs";
-import { P as $env, T as warn, _ as parseStreamingJsonThrottled, g as parseStreamingJson, h as parseJsonWithRepair } from "./src-BcD0_rQR.mjs";
-import { g as MissingApiKeyError, l as finalize, r as ValidationError, s as ProviderResponseError, v as AbortError } from "./error-C-f_Wnw4.mjs";
-import { C as kStreamingPartialJson, S as kStreamingLastParseLen, _ as kCursorExecResolved, a as normalizeSystemPrompts, b as kStreamingBlockKind, h as clearStreamingPartialJson, k as toolWireSchema, x as kStreamingEnvelopeId, y as kStreamingBlockIndex } from "./utils-Cp2Mxf_U.mjs";
-import { t as sanitizeText } from "./sanitize-text-CfcXzw5X.mjs";
-import { a as shouldBypassProxy, n as getProxyForProvider, t as connectProxiedSocket } from "./proxy-D9lm7ONA.mjs";
-import { t as calculateCost, y as isKimiK3ModelId } from "./models-DRA2c_8U.mjs";
-import "./identity-HNO1Oe9B.mjs";
-import { t as AssistantMessageEventStream } from "./event-stream-Dh2guZxS.mjs";
-import { n as isRequestDebugEnabled, t as createRequestDebugSession } from "./request-debug-HJMoJncL.mjs";
-import { A as isObject, B as scalarZeroValue, C as getTextEncoding, D as hasCustomJsonRepresentation, E as create, F as unsafeGet, H as ScalarType, I as unsafeIsSet, L as unsafeLocal, M as isReflectMap, N as isReflectMessage, O as isWrapper, P as unsafeClear, R as unsafeOneofCase, T as isFieldError, U as isMessage, V as protoInt64, _ as BinaryWriter, a as makeReadContext$1, c as messageDesc, d as base64Decode, f as base64Encode, g as BinaryReader, h as wktStructToReflect, i as fromBinary, j as isReflectList, k as isWrapperDesc, l as protoCamelCase, m as wktStructToLocal, n as writeField, o as readField, p as localMessageMapper, r as fileDesc, t as toBinary, u as protoSnakeCase, w as FieldError, z as unsafeSet } from "./to-binary-B1BEBIPC.mjs";
-import { $ as GrepUnionResultSchema, $t as PiWriteExecSuccessSchema, A as DiagnosticsSuccessSchema, An as ShellStreamStdoutSchema, At as PiBashExecErrorSchema, B as ForceBackgroundSubagentResultSchema, Bn as SubagentStopRequestResponseSchema, Bt as PiGrepExecErrorSchema, C as DeleteErrorSchema, Cn as ShellFailureSchema, Ct as McpToolCallSchema, D as DiagnosticsErrorSchema, Dn as ShellStreamSchema, Dt as McpToolResultContentItemSchema, E as DeleteSuccessSchema, En as ShellStreamExitSchema, Et as McpToolNotFoundSchema, F as ExecuteHookResponseSchema, Fn as SubagentAwaitNotFoundSchema, Ft as PiEditExecResultSchema, G as GrepContentResultSchema, Gn as WebFetchAllowlistPrecheckResultSchema, Gt as PiLsExecSuccessSchema, Hn as ToolCallSchema, Ht as PiGrepExecSuccessSchema, I as ExecuteHookResultSchema, In as SubagentAwaitResultSchema, It as PiEditExecSuccessSchema, J as GrepFileCountSchema, Jn as WriteResultSchema, Jt as PiReadExecSuccessSchema, K as GrepCountResultSchema, Kn as WriteErrorSchema, Kt as PiReadExecErrorSchema, L as FetchErrorSchema, Ln as SubagentErrorSchema, Lt as PiFindExecErrorSchema, M as ExecClientMessageSchema, Mn as SmartModeClassifierErrorSchema, Mt as PiBashExecSuccessSchema, N as ExecClientStreamCloseSchema, Nn as SmartModeClassifierResultSchema, Nt as PiEditExecErrorSchema, O as DiagnosticsRejectedSchema, On as ShellStreamStartSchema, Ot as McpToolResultSchema, P as ExecClientThrowSchema, Pn as StopRequestResponseSchema, Pt as PiEditExecRejectedSchema, Q as GrepSuccessSchema, Qt as PiWriteExecResultSchema, R as FetchResultSchema, Rn as SubagentResultSchema, Rt as PiFindExecResultSchema, S as ConversationTurnStructureSchema, Sn as ShellAllowlistPrecheckResultSchema, St as McpTextContentSchema, T as DeleteResultSchema, Tn as ShellResultSchema, Tt as McpToolErrorSchema, Un as UserMessageActionSchema, Ut as PiLsExecErrorSchema, V as GetBlobResultSchema, Vn as ThinkingMessageSchema, Vt as PiGrepExecResultSchema, W as GrepContentMatchSchema, Wn as UserMessageSchema, Wt as PiLsExecResultSchema, X as GrepFilesResultSchema, Xn as WriteShellStdinResultSchema, Xt as PiWriteExecErrorSchema, Y as GrepFileMatchSchema, Yn as WriteShellStdinErrorSchema, Yt as PiTruncationSchema, Z as GrepResultSchema, Zn as WriteSuccessSchema, Zt as PiWriteExecRejectedSchema, _ as ConversationActionSchema, _n as RequestedModelSchema, _t as McpResultSchema, a as AgentRunRequestSchema, an as ReadMcpResourceErrorSchema, at as LsDirectoryTreeNodeSchema, b as ConversationStateStructureSchema, bn as SelectedImageSchema, bt as McpStateSuccessSchema, c as AgentStoreConflictResultSchema, cn as ReadMcpResourceSuccessSchema, ct as LsRejectedSchema, d as BeforeSubmitPromptRequestResponseSchema, dn as ReadSuccessSchema, dt as McpAllowlistPrecheckResultSchema, en as PostToolUseFailureRequestResponseSchema, et as KvClientMessageSchema, f as CanvasDiagnosticsErrorSchema, fn as RecordScreenFailureSchema, ft as McpApprovedSchema, g as ComputerUseResultSchema, gn as RequestContextSuccessSchema, gt as McpRejectedSchema, h as ComputerUseErrorSchema, hn as RequestContextSchema, ht as McpImageContentSchema, i as AgentConversationTurnStructureSchema, in as ReadErrorSchema, it as ListMcpResourcesSuccessSchema, j as ExecClientControlMessageSchema, jn as ShellSuccessSchema, jt as PiBashExecResultSchema, k as DiagnosticsResultSchema, kn as ShellStreamStderrSchema, kt as ModelDetailsSchema, l as AssistantMessageSchema, ln as ReadRejectedSchema, lt as LsResultSchema, m as ClientHeartbeatSchema, mn as RequestContextResultSchema, mt as McpErrorSchema, n as AfterAgentThoughtRequestResponseSchema, nn as PreCompactRequestResponseSchema, nt as ListMcpResourcesExecResultSchema, o as AgentServerMessageSchema, on as ReadMcpResourceExecResultSchema, ot as LsDirectoryTreeNode_FileSchema, p as CanvasDiagnosticsResultSchema, pn as RecordScreenResultSchema, pt as McpArgsSchema, q as GrepErrorSchema, qn as WriteRejectedSchema, qt as PiReadExecResultSchema, r as AgentClientMessageSchema, rn as PreToolUseRequestResponseSchema, rt as ListMcpResourcesExecResult_McpResourceSchema, s as AgentStoreConflictErrorSchema, sn as ReadMcpResourceNotFoundSchema, st as LsErrorSchema, t as AfterAgentResponseRequestResponseSchema, tn as PostToolUseRequestResponseSchema, tt as ListMcpResourcesErrorSchema, u as BackgroundShellSpawnResultSchema, un as ReadResultSchema, ut as LsSuccessSchema, v as ConversationSearchErrorSchema, vn as ResumeActionSchema, vt as McpStateExecResultSchema, w as DeleteRejectedSchema, wn as ShellRejectedSchema, wt as McpToolDefinitionSchema, x as ConversationStepSchema, xn as SetBlobResultSchema, xt as McpSuccessSchema, y as ConversationSearchResultSchema, yn as SelectedContextSchema, yt as McpStateServerSchema, z as ForceBackgroundShellResultSchema, zn as SubagentStartRequestResponseSchema, zt as PiFindExecSuccessSchema } from "./agent_pb-Rizyt9Zg.mjs";
-import { t as deterministicUuid } from "./deterministic-id-D-yIV_eI.mjs";
+import { C as warn, M as truncate, N as $env, _ as parseStreamingJson, b as debug, g as parseJsonWithRepair, v as parseStreamingJsonThrottled } from "./src-BwW51vA5.mjs";
+import { _ as AbortError, c as finalize, h as MissingApiKeyError, r as ValidationError, s as ProviderResponseError } from "./error-CORgGg5a.mjs";
+import { A as toolWireSchema, C as kStreamingLastParseLen, I as sanitizeSchemaForCursor, S as kStreamingEnvelopeId, b as kStreamingBlockIndex, g as clearStreamingPartialJson, o as normalizeSystemPrompts, s as normalizeToolCallId, v as kCursorExecResolved, w as kStreamingPartialJson, x as kStreamingBlockKind } from "./utils-CUPhpw9A.mjs";
+import { t as sanitizeText } from "./sanitize-text-BCf5KmCf.mjs";
+import { n as isRecord$1 } from "./type-guards-CttAANEx.mjs";
+import { n as classifyModel, r as collapseVariantId } from "./taxonomy-DSIM99rS.mjs";
+import { n as getProxyForUrl, t as connectProxiedSocket } from "./proxy-5nWqRL1f.mjs";
+import { n as THINKING_EFFORTS } from "./effort-BdtQMN-_.mjs";
+import { t as calculateCost } from "./models-DnXMYGcJ.mjs";
+import { t as AssistantMessageEventStream } from "./event-stream-ulcDenZD.mjs";
+import { n as isRequestDebugEnabled, t as createRequestDebugSession } from "./request-debug-NQN0BjHH.mjs";
+import { i as fromBinary, n as decodeJsonValue, o as toBinary, r as encodeJsonValue, t as create } from "./protobuf-aab1UGVn.mjs";
+import { $ as ForceBackgroundSubagentResultSchema, $n as SubagentResultSchema, $t as PiFindExecSuccessSchema, A as CursorRuleTypeGlobalSchema, An as RequestContextSuccessSchema, At as McpRejectedSchema, B as ExaFetchRequestResponseSchema, Bn as ShellResultSchema, Bt as McpToolNotFoundSchema, C as ConversationStateStructureSchema, Cn as ReadRejectedSchema, Ct as LsResultSchema, D as CreatePlanRequestResponseSchema, Dn as RecordScreenResultSchema, Dt as McpArgsSchema, E as CreatePlanErrorSchema, En as RecordScreenFailureSchema, Et as McpApprovedSchema, F as DeleteSuccessSchema, Fn as SelectedImageSchema, Ft as McpSuccessSchema, G as ExecClientMessageSchema, Gn as ShellStreamStdoutSchema, Gt as PiBashExecResultSchema, H as ExaSearchRequestResponseSchema, Hn as ShellStreamSchema, Ht as McpToolResultSchema, I as DiagnosticsErrorSchema, In as SetBlobResultSchema, It as McpTextContentSchema, J as ExecuteHookResponseSchema, Jn as SmartModeClassifierResultSchema, Jt as PiEditExecRejectedSchema, K as ExecClientStreamCloseSchema, Kn as ShellSuccessSchema, Kt as PiBashExecSuccessSchema, L as DiagnosticsRejectedSchema, Ln as ShellAllowlistPrecheckResultSchema, Lt as McpToolCallSchema, M as DeleteErrorSchema, Mn as RequestedModel_ModelParameterbytesSchema, Mt as McpStateExecResultSchema, N as DeleteRejectedSchema, Nn as ResumeActionSchema, Nt as McpStateServerSchema, O as CreatePlanResultSchema, On as RequestContextResultSchema, Ot as McpErrorSchema, P as DeleteResultSchema, Pn as SelectedContextSchema, Pt as McpStateSuccessSchema, Q as ForceBackgroundShellResultSchema, Qn as SubagentErrorSchema, Qt as PiFindExecResultSchema, R as DiagnosticsResultSchema, Rn as ShellFailureSchema, Rt as McpToolDefinitionSchema, S as ConversationSearchResultSchema, Sn as ReadMcpResourceSuccessSchema, St as LsRejectedSchema, T as ConversationTurnStructureSchema, Tn as ReadSuccessSchema, Tt as McpAllowlistPrecheckResultSchema, U as ExaSearchRequestResponse_ApprovedSchema, Un as ShellStreamStartSchema, Ut as ModelDetailsSchema, V as ExaFetchRequestResponse_ApprovedSchema, Vn as ShellStreamExitSchema, Vt as McpToolResultContentItemSchema, W as ExecClientControlMessageSchema, Wn as ShellStreamStderrSchema, Wt as PiBashExecErrorSchema, X as FetchErrorSchema, Xn as SubagentAwaitNotFoundSchema, Xt as PiEditExecSuccessSchema, Y as ExecuteHookResultSchema, Yn as StopRequestResponseSchema, Yt as PiEditExecResultSchema, Z as FetchResultSchema, Zn as SubagentAwaitResultSchema, Zt as PiFindExecErrorSchema, _ as ClientHeartbeatSchema, _n as PreToolUseRequestResponseSchema, _r as WriteShellStdinResultSchema, _t as ListMcpResourcesExecResult_McpResourceSchema, a as AgentRunRequestSchema, an as PiLsExecSuccessSchema, ar as ToolCallSchema, at as GrepCountResultSchema, b as ConversationActionSchema, bn as ReadMcpResourceExecResultSchema, bt as LsDirectoryTreeNode_FileSchema, c as AgentStoreConflictResultSchema, cn as PiReadExecSuccessSchema, cr as WebFetchAllowlistPrecheckResultSchema, ct as GrepFileMatchSchema, d as AskQuestionResultSchema, dn as PiWriteExecRejectedSchema, dr as WebSearchRequestResponseSchema, dt as GrepSuccessSchema, en as PiGrepExecErrorSchema, er as SubagentStartRequestResponseSchema, et as GetBlobResultSchema, f as AssistantMessageSchema, fn as PiWriteExecResultSchema, fr as WebSearchRequestResponse_ApprovedSchema, ft as GrepUnionResultSchema, g as CanvasDiagnosticsResultSchema, gn as PreCompactRequestResponseSchema, gr as WriteShellStdinErrorSchema, gt as ListMcpResourcesExecResultSchema, h as CanvasDiagnosticsErrorSchema, hn as PostToolUseRequestResponseSchema, hr as WriteResultSchema, ht as ListMcpResourcesErrorSchema, i as AgentConversationTurnStructureSchema, in as PiLsExecResultSchema, ir as ThinkingMessageSchema, it as GrepContentResultSchema, j as CursorRuleTypeSchema, jn as RequestedModelSchema, jt as McpResultSchema, k as CursorRuleSchema, kn as RequestContextSchema, kt as McpImageContentSchema, l as AskQuestionInteractionResponseSchema, ln as PiTruncationSchema, lr as WebFetchRequestResponseSchema, lt as GrepFilesResultSchema, m as BeforeSubmitPromptRequestResponseSchema, mn as PostToolUseFailureRequestResponseSchema, mr as WriteRejectedSchema, mt as KvClientMessageSchema, n as AfterAgentThoughtRequestResponseSchema, nn as PiGrepExecSuccessSchema, nr as SwitchModeRequestResponseSchema, o as AgentServerMessageSchema, on as PiReadExecErrorSchema, or as UserMessageActionSchema, ot as GrepErrorSchema, p as BackgroundShellSpawnResultSchema, pn as PiWriteExecSuccessSchema, pr as WriteErrorSchema, pt as InteractionResponseSchema, q as ExecClientThrowSchema, qn as SmartModeClassifierErrorSchema, qt as PiEditExecErrorSchema, r as AgentClientMessageSchema, rn as PiLsExecErrorSchema, rr as SwitchModeRequestResponse_RejectedSchema, rt as GrepContentMatchSchema, s as AgentStoreConflictErrorSchema, sn as PiReadExecResultSchema, sr as UserMessageSchema, st as GrepFileCountSchema, t as AfterAgentResponseRequestResponseSchema, tn as PiGrepExecResultSchema, tr as SubagentStopRequestResponseSchema, u as AskQuestionRejectedSchema, un as PiWriteExecErrorSchema, ur as WebFetchRequestResponse_ApprovedSchema, ut as GrepResultSchema, v as ComputerUseErrorSchema, vn as ReadErrorSchema, vr as WriteSuccessSchema, vt as ListMcpResourcesSuccessSchema, w as ConversationStepSchema, wn as ReadResultSchema, wt as LsSuccessSchema, x as ConversationSearchErrorSchema, xn as ReadMcpResourceNotFoundSchema, xt as LsErrorSchema, y as ComputerUseResultSchema, yn as ReadMcpResourceErrorSchema, yt as LsDirectoryTreeNodeSchema, z as DiagnosticsSuccessSchema, zn as ShellRejectedSchema, zt as McpToolErrorSchema } from "./cursor-proto-B8Wj8bv9.mjs";
+import { t as deterministicUuid } from "./deterministic-id-CUEIMSqR.mjs";
 import * as path from "node:path";
 import { createHash } from "node:crypto";
 import http2 from "node:http2";
-//#region node_modules/.pnpm/@bufbuild+protobuf@2.14.0/node_modules/@bufbuild/protobuf/dist/esm/reflect/reflect-check.js
+//#region node_modules/.pnpm/@oh-my-pi+pi-ai@18.1.17/node_modules/@oh-my-pi/pi-ai/src/providers/connect-error-detail.ts
 /**
-* Check whether the given field value is valid for the reflect API.
-*/
-function checkField(field, value) {
-	const check = field.fieldKind == "list" ? isReflectList(value, field) : field.fieldKind == "map" ? isReflectMap(value, field) : checkSingular(field, value);
-	if (check === true) return;
-	let reason;
-	switch (field.fieldKind) {
-		case "list":
-			reason = `expected ${formatReflectList(field)}, got ${formatVal(value)}`;
-			break;
-		case "map":
-			reason = `expected ${formatReflectMap(field)}, got ${formatVal(value)}`;
-			break;
-		default: reason = reasonSingular(field, value, check);
-	}
-	return new FieldError(field, reason);
-}
-/**
-* Check whether the given list item is valid for the reflect API.
-*/
-function checkListItem(field, index, value) {
-	const check = checkSingular(field, value);
-	if (check !== true) return new FieldError(field, `list item #${index + 1}: ${reasonSingular(field, value, check)}`);
-}
-/**
-* Check whether the given map key and value are valid for the reflect API.
-*/
-function checkMapEntry(field, key, value) {
-	const checkKey = checkScalarValue(field.mapKey)(key);
-	if (checkKey !== true) return new FieldError(field, `invalid map key: ${reasonSingular({ scalar: field.mapKey }, key, checkKey)}`);
-	const checkVal = checkSingular(field, value);
-	if (checkVal !== true) return new FieldError(field, `map entry ${formatVal(key)}: ${reasonSingular(field, value, checkVal)}`);
-}
-function checkSingular(field, value) {
-	if (field.scalar !== void 0) return checkScalarValue(field.scalar)(value);
-	if (field.enum !== void 0) {
-		if (field.enum.open) return checkScalarValue(ScalarType.INT32)(value);
-		return field.enum.values.some((v) => v.number === value);
-	}
-	return isReflectMessage(value, field.message);
-}
-/**
-* Return the check for values of the given scalar type.
-*
-* @private
-*/
-function checkScalarValue(scalar) {
-	switch (scalar) {
-		case ScalarType.DOUBLE: return (value) => typeof value == "number";
-		case ScalarType.FLOAT: return (value) => {
-			if (typeof value != "number") return false;
-			if (Number.isNaN(value) || !Number.isFinite(value)) return true;
-			if (value > 34028234663852886e22 || value < -34028234663852886e22) return `${value.toFixed()} out of range`;
-			return true;
-		};
-		case ScalarType.INT32:
-		case ScalarType.SFIXED32:
-		case ScalarType.SINT32: return (value) => {
-			if (typeof value !== "number" || !Number.isInteger(value)) return false;
-			if (value > 2147483647 || value < -2147483648) return `${value.toFixed()} out of range`;
-			return true;
-		};
-		case ScalarType.FIXED32:
-		case ScalarType.UINT32: return (value) => {
-			if (typeof value !== "number" || !Number.isInteger(value)) return false;
-			if (value > 4294967295 || value < 0) return `${value.toFixed()} out of range`;
-			return true;
-		};
-		case ScalarType.BOOL: return (value) => typeof value == "boolean";
-		case ScalarType.STRING: return (value) => {
-			if (typeof value != "string") return false;
-			return getTextEncoding().checkUtf8(value) || "invalid UTF8";
-		};
-		case ScalarType.BYTES: return (value) => value instanceof Uint8Array;
-		case ScalarType.INT64:
-		case ScalarType.SFIXED64:
-		case ScalarType.SINT64: return (value) => {
-			if (typeof value == "bigint" || typeof value == "number" || typeof value == "string" && value.length > 0) try {
-				protoInt64.parse(value);
-				return true;
-			} catch (_) {
-				return `${value} out of range`;
-			}
-			return false;
-		};
-		case ScalarType.FIXED64:
-		case ScalarType.UINT64: return (value) => {
-			if (typeof value == "bigint" || typeof value == "number" || typeof value == "string" && value.length > 0) try {
-				protoInt64.uParse(value);
-				return true;
-			} catch (_) {
-				return `${value} out of range`;
-			}
-			return false;
-		};
-	}
-}
-/**
-* Format the reason why a value is invalid for a singular field.
+* Connect-protocol end-stream error formatting.
 *
-* @private
+* A Connect end-of-stream trailer carries an error object of the shape
+* code / message / details. Some backends collapse the useful part into a
+* generic message (for example just "Error"), which previously surfaced
+* verbatim as "Connect error invalid_argument: Error" — an unactionable
+* string that hid both the failing argument and which transport produced it
+* (Refs #4813). This module keeps the existing "Connect error code: message"
+* prefix byte-for-byte and appends what the trailer actually contained:
+* typed detail entries are summarized, and when the message is generic the
+* remaining trailer fields are appended (truncated) so the server's real
+* rejection is visible in logs and bug reports.
 */
-function reasonSingular(field, val, details) {
-	details = typeof details == "string" ? `: ${details}` : `, got ${formatVal(val)}`;
-	if (field.scalar !== void 0) return `expected ${scalarTypeDescription(field.scalar)}` + details;
-	if (field.enum !== void 0) return `expected ${field.enum.toString()}` + details;
-	return `expected ${formatReflectMessage(field.message)}` + details;
-}
-function formatVal(val) {
-	switch (typeof val) {
-		case "object":
-			if (val === null) return "null";
-			if (val instanceof Uint8Array) return `Uint8Array(${val.length})`;
-			if (Array.isArray(val)) return `Array(${val.length})`;
-			if (isReflectList(val)) return formatReflectList(val.field());
-			if (isReflectMap(val)) return formatReflectMap(val.field());
-			if (isReflectMessage(val)) return formatReflectMessage(val.desc);
-			if (isMessage(val)) return `message ${val.$typeName}`;
-			return "object";
-		case "string": return val.length > 30 ? "string" : `"${val.split("\"").join("\\\"")}"`;
-		case "boolean": return String(val);
-		case "number": return String(val);
-		case "bigint": return String(val) + "n";
-		default: return typeof val;
-	}
-}
-function formatReflectMessage(desc) {
-	return `ReflectMessage (${desc.typeName})`;
-}
-function formatReflectList(field) {
-	switch (field.listKind) {
-		case "message": return `ReflectList (${field.message.toString()})`;
-		case "enum": return `ReflectList (${field.enum.toString()})`;
-		case "scalar": return `ReflectList (${ScalarType[field.scalar]})`;
-	}
-}
-function formatReflectMap(field) {
-	switch (field.mapKind) {
-		case "message": return `ReflectMap (${ScalarType[field.mapKey]}, ${field.message.toString()})`;
-		case "enum": return `ReflectMap (${ScalarType[field.mapKey]}, ${field.enum.toString()})`;
-		case "scalar": return `ReflectMap (${ScalarType[field.mapKey]}, ${ScalarType[field.scalar]})`;
-	}
-}
-function scalarTypeDescription(scalar) {
-	switch (scalar) {
-		case ScalarType.STRING: return "string";
-		case ScalarType.BOOL: return "boolean";
-		case ScalarType.INT64:
-		case ScalarType.SINT64:
-		case ScalarType.SFIXED64: return "bigint (int64)";
-		case ScalarType.UINT64:
-		case ScalarType.FIXED64: return "bigint (uint64)";
-		case ScalarType.BYTES: return "Uint8Array";
-		case ScalarType.DOUBLE: return "number (float64)";
-		case ScalarType.FLOAT: return "number (float32)";
-		case ScalarType.FIXED32:
-		case ScalarType.UINT32: return "number (uint32)";
-		case ScalarType.INT32:
-		case ScalarType.SFIXED32:
-		case ScalarType.SINT32: return "number (int32)";
-	}
-}
-//#endregion
-//#region node_modules/.pnpm/@bufbuild+protobuf@2.14.0/node_modules/@bufbuild/protobuf/dist/esm/reflect/reflect.js
-/**
-* Create a ReflectMessage.
-*/
-function reflect(messageDesc, message, check = true) {
-	return new ReflectMessageImpl(messageDesc, message, check);
-}
-const messageSortedFields = /* @__PURE__ */ new WeakMap();
-var ReflectMessageImpl = class {
-	get sortedFields() {
-		const cached = messageSortedFields.get(this.desc);
-		if (cached) return cached;
-		const sortedFields = this.desc.fields.concat().sort((a, b) => a.number - b.number);
-		messageSortedFields.set(this.desc, sortedFields);
-		return sortedFields;
-	}
-	constructor(messageDesc, message, check = true) {
-		this.lists = /* @__PURE__ */ new Map();
-		this.maps = /* @__PURE__ */ new Map();
-		this.check = check;
-		this.desc = messageDesc;
-		this.message = this[unsafeLocal] = message !== null && message !== void 0 ? message : create(messageDesc);
-		this.fields = messageDesc.fields;
-		this.oneofs = messageDesc.oneofs;
-		this.members = messageDesc.members;
-	}
-	findNumber(number) {
-		if (!this._fieldsByNumber) this._fieldsByNumber = new Map(this.desc.fields.map((f) => [f.number, f]));
-		return this._fieldsByNumber.get(number);
-	}
-	oneofCase(oneof) {
-		assertOwn(this.message, oneof);
-		return unsafeOneofCase(this.message, oneof);
-	}
-	isSet(field) {
-		assertOwn(this.message, field);
-		return unsafeIsSet(this.message, field);
-	}
-	clear(field) {
-		assertOwn(this.message, field);
-		unsafeClear(this.message, field);
-	}
-	get(field) {
-		assertOwn(this.message, field);
-		const value = unsafeGet(this.message, field);
-		switch (field.fieldKind) {
-			case "list":
-				let list = this.lists.get(field);
-				if (!list || list[unsafeLocal] !== value) this.lists.set(field, list = new ReflectListImpl(field, value, this.check));
-				return list;
-			case "map":
-				let map = this.maps.get(field);
-				if (!map || map[unsafeLocal] !== value) this.maps.set(field, map = new ReflectMapImpl(field, value, this.check));
-				return map;
-			case "message": return messageToReflect(field, value, this.check);
-			case "scalar": return value === void 0 ? scalarZeroValue(field.scalar, false) : longToReflect(field, value);
-			case "enum": return value !== null && value !== void 0 ? value : field.enum.values[0].number;
-		}
-	}
-	set(field, value) {
-		assertOwn(this.message, field);
-		if (this.check) {
-			const err = checkField(field, value);
-			if (err) throw err;
-		}
-		let local;
-		if (field.fieldKind == "message") local = messageToLocal(field, value);
-		else if (isReflectMap(value) || isReflectList(value)) local = value[unsafeLocal];
-		else local = longToLocal(field, value);
-		unsafeSet(this.message, field, local);
-	}
-	getUnknown() {
-		return this.message.$unknown;
-	}
-	setUnknown(value) {
-		this.message.$unknown = value;
-	}
-};
-function assertOwn(owner, member) {
-	if (member.parent.typeName !== owner.$typeName) throw new FieldError(member, `cannot use ${member.toString()} with message ${owner.$typeName}`, "ForeignFieldError");
-}
-var ReflectListImpl = class {
-	field() {
-		return this._field;
-	}
-	get size() {
-		return this._arr.length;
-	}
-	constructor(field, unsafeInput, check) {
-		this._field = field;
-		this._arr = this[unsafeLocal] = unsafeInput;
-		this.check = check;
-	}
-	get(index) {
-		const item = this._arr[index];
-		return item === void 0 ? void 0 : listItemToReflect(this._field, item, this.check);
-	}
-	set(index, item) {
-		if (index < 0 || index >= this._arr.length) throw new FieldError(this._field, `list item #${index + 1}: out of range`);
-		if (this.check) {
-			const err = checkListItem(this._field, index, item);
-			if (err) throw err;
-		}
-		this._arr[index] = listItemToLocal(this._field, item);
-	}
-	add(item) {
-		if (this.check) {
-			const err = checkListItem(this._field, this._arr.length, item);
-			if (err) throw err;
-		}
-		this._arr.push(listItemToLocal(this._field, item));
-	}
-	clear() {
-		this._arr.splice(0, this._arr.length);
-	}
-	[Symbol.iterator]() {
-		return this.values();
-	}
-	keys() {
-		return this._arr.keys();
-	}
-	*values() {
-		for (const item of this._arr) yield listItemToReflect(this._field, item, this.check);
-	}
-	*entries() {
-		for (let i = 0; i < this._arr.length; i++) yield [i, listItemToReflect(this._field, this._arr[i], this.check)];
-	}
-};
-var ReflectMapImpl = class {
-	constructor(field, unsafeInput, check = true) {
-		this.obj = this[unsafeLocal] = unsafeInput !== null && unsafeInput !== void 0 ? unsafeInput : {};
-		this.check = check;
-		this._field = field;
-	}
-	field() {
-		return this._field;
-	}
-	set(key, value) {
-		if (this.check) {
-			const err = checkMapEntry(this._field, key, value);
-			if (err) throw err;
-		}
-		this.obj[mapKeyToLocal(key)] = mapValueToLocal(this._field, value);
-		return this;
-	}
-	delete(key) {
-		const k = mapKeyToLocal(key);
-		const has = Object.prototype.hasOwnProperty.call(this.obj, k);
-		if (has) delete this.obj[k];
-		return has;
-	}
-	clear() {
-		for (const key of Object.keys(this.obj)) delete this.obj[key];
-	}
-	get(key) {
-		let val = this.obj[mapKeyToLocal(key)];
-		if (val !== void 0) val = mapValueToReflect(this._field, val, this.check);
-		return val;
-	}
-	has(key) {
-		return Object.prototype.hasOwnProperty.call(this.obj, mapKeyToLocal(key));
-	}
-	*keys() {
-		for (const objKey of Object.keys(this.obj)) yield mapKeyToReflect(objKey, this._field.mapKey);
-	}
-	*entries() {
-		for (const objEntry of Object.entries(this.obj)) yield [mapKeyToReflect(objEntry[0], this._field.mapKey), mapValueToReflect(this._field, objEntry[1], this.check)];
-	}
-	[Symbol.iterator]() {
-		return this.entries();
-	}
-	get size() {
-		return Object.keys(this.obj).length;
-	}
-	*values() {
-		for (const val of Object.values(this.obj)) yield mapValueToReflect(this._field, val, this.check);
-	}
-	forEach(callbackfn, thisArg) {
-		for (const mapEntry of this.entries()) callbackfn.call(thisArg, mapEntry[1], mapEntry[0], this);
-	}
-};
-function messageToLocal(field, value) {
-	if (!isReflectMessage(value)) return value;
-	if (isWrapper(value.message) && !field.oneof && field.fieldKind == "message") return value.message.value;
-	if (value.desc.typeName == "google.protobuf.Struct" && field.parent.typeName != "google.protobuf.Value") return wktStructToLocal(value.message);
-	return value.message;
-}
-function messageToReflect(field, value, check) {
-	if (value !== void 0) {
-		if (isWrapperDesc(field.message) && !field.oneof && field.fieldKind == "message") value = {
-			$typeName: field.message.typeName,
-			value: longToReflect(field.message.fields[0], value)
-		};
-		else if (field.message.typeName == "google.protobuf.Struct" && field.parent.typeName != "google.protobuf.Value" && isObject(value)) value = wktStructToReflect(value);
-	}
-	return new ReflectMessageImpl(field.message, value, check);
-}
-function listItemToLocal(field, value) {
-	if (field.listKind == "message") return messageToLocal(field, value);
-	return longToLocal(field, value);
-}
-function listItemToReflect(field, value, check) {
-	if (field.listKind == "message") return messageToReflect(field, value, check);
-	return longToReflect(field, value);
-}
-function mapValueToLocal(field, value) {
-	if (field.mapKind == "message") return messageToLocal(field, value);
-	return longToLocal(field, value);
-}
-function mapValueToReflect(field, value, check) {
-	if (field.mapKind == "message") return messageToReflect(field, value, check);
-	return value;
-}
-function mapKeyToLocal(key) {
-	return typeof key == "string" || typeof key == "number" ? key : String(key);
-}
-/**
-* Converts a map key (any scalar value except float, double, or bytes) from its
-* representation in a message (string or number, the only possible object key
-* types) to the closest possible type in ECMAScript.
-*/
-function mapKeyToReflect(key, type) {
-	switch (type) {
-		case ScalarType.STRING: return key;
-		case ScalarType.INT32:
-		case ScalarType.FIXED32:
-		case ScalarType.UINT32:
-		case ScalarType.SFIXED32:
-		case ScalarType.SINT32: {
-			const n = Number.parseInt(key);
-			if (Number.isFinite(n)) return n;
-			break;
-		}
-		case ScalarType.BOOL:
-			switch (key) {
-				case "true": return true;
-				case "false": return false;
-			}
-			break;
-		case ScalarType.UINT64:
-		case ScalarType.FIXED64:
-			try {
-				return protoInt64.uParse(key);
-			} catch (_a) {}
-			break;
-		default: try {
-			return protoInt64.parse(key);
-		} catch (_b) {}
-	}
-	return key;
-}
-function longToReflect(field, value) {
-	switch (field.scalar) {
-		case ScalarType.INT64:
-		case ScalarType.SFIXED64:
-		case ScalarType.SINT64:
-			if ("longAsString" in field && field.longAsString && typeof value == "string") value = protoInt64.parse(value);
-			break;
-		case ScalarType.FIXED64:
-		case ScalarType.UINT64: if ("longAsString" in field && field.longAsString && typeof value == "string") value = protoInt64.uParse(value);
-	}
-	return value;
-}
-function longToLocal(field, value) {
-	switch (field.scalar) {
-		case ScalarType.INT64:
-		case ScalarType.SFIXED64:
-		case ScalarType.SINT64:
-			if ("longAsString" in field && field.longAsString) value = String(value);
-			else if (typeof value == "string" || typeof value == "number") value = protoInt64.parse(value);
-			break;
-		case ScalarType.FIXED64:
-		case ScalarType.UINT64: if ("longAsString" in field && field.longAsString) value = String(value);
-		else if (typeof value == "string" || typeof value == "number") value = protoInt64.uParse(value);
-	}
-	return value;
-}
-/**
-* Describes the message google.protobuf.Any.
-* Use `create(AnySchema)` to create a new message.
-*/
-const AnySchema = /*@__PURE__*/ messageDesc(/* @__PURE__ */ fileDesc("Chlnb29nbGUvcHJvdG9idWYvYW55LnByb3RvEg9nb29nbGUucHJvdG9idWYiJgoDQW55EhAKCHR5cGVfdXJsGAEgASgJEg0KBXZhbHVlGAIgASgMQnYKE2NvbS5nb29nbGUucHJvdG9idWZCCEFueVByb3RvUAFaLGdvb2dsZS5nb2xhbmcub3JnL3Byb3RvYnVmL3R5cGVzL2tub3duL2FueXBiogIDR1BCqgIeR29vZ2xlLlByb3RvYnVmLldlbGxLbm93blR5cGVzYgZwcm90bzM"), 0);
-//#endregion
-//#region node_modules/.pnpm/@bufbuild+protobuf@2.14.0/node_modules/@bufbuild/protobuf/dist/esm/wkt/any.js
-function anyPack(schema, message, into) {
-	let ret = false;
-	if (!into) {
-		into = create(AnySchema);
-		ret = true;
-	}
-	into.value = toBinary(schema, message);
-	into.typeUrl = typeNameToUrl(message.$typeName);
-	return ret ? into : void 0;
-}
-function anyIs(any, descOrTypeName) {
-	if (any.typeUrl === "") return false;
-	return (typeof descOrTypeName == "string" ? descOrTypeName : descOrTypeName.typeName) === typeUrlToName(any.typeUrl);
-}
-function anyUnpack(any, registryOrMessageDesc) {
-	if (any.typeUrl === "") return;
-	const desc = registryOrMessageDesc.kind == "message" ? registryOrMessageDesc : registryOrMessageDesc.getMessage(typeUrlToName(any.typeUrl));
-	if (!desc || !anyIs(any, desc)) return;
-	return fromBinary(desc, any.value);
-}
-function typeNameToUrl(name) {
-	return `type.googleapis.com/${name}`;
-}
-function typeUrlToName(url) {
-	const slash = url.lastIndexOf("/");
-	const name = slash >= 0 ? url.substring(slash + 1) : url;
-	if (!name.length) throw new Error(`invalid type url: ${url}`);
-	return name;
-}
-//#endregion
-//#region node_modules/.pnpm/@bufbuild+protobuf@2.14.0/node_modules/@bufbuild/protobuf/dist/esm/wkt/gen/google/protobuf/struct_pb.js
-/**
-* Describes the file google/protobuf/struct.proto.
-*/
-const file_google_protobuf_struct = /*@__PURE__*/ fileDesc("Chxnb29nbGUvcHJvdG9idWYvc3RydWN0LnByb3RvEg9nb29nbGUucHJvdG9idWYihAEKBlN0cnVjdBIzCgZmaWVsZHMYASADKAsyIy5nb29nbGUucHJvdG9idWYuU3RydWN0LkZpZWxkc0VudHJ5GkUKC0ZpZWxkc0VudHJ5EgsKA2tleRgBIAEoCRIlCgV2YWx1ZRgCIAEoCzIWLmdvb2dsZS5wcm90b2J1Zi5WYWx1ZToCOAEi6gEKBVZhbHVlEjAKCm51bGxfdmFsdWUYASABKA4yGi5nb29nbGUucHJvdG9idWYuTnVsbFZhbHVlSAASFgoMbnVtYmVyX3ZhbHVlGAIgASgBSAASFgoMc3RyaW5nX3ZhbHVlGAMgASgJSAASFAoKYm9vbF92YWx1ZRgEIAEoCEgAEi8KDHN0cnVjdF92YWx1ZRgFIAEoCzIXLmdvb2dsZS5wcm90b2J1Zi5TdHJ1Y3RIABIwCgpsaXN0X3ZhbHVlGAYgASgLMhouZ29vZ2xlLnByb3RvYnVmLkxpc3RWYWx1ZUgAQgYKBGtpbmQiMwoJTGlzdFZhbHVlEiYKBnZhbHVlcxgBIAMoCzIWLmdvb2dsZS5wcm90b2J1Zi5WYWx1ZSobCglOdWxsVmFsdWUSDgoKTlVMTF9WQUxVRRAAQn8KE2NvbS5nb29nbGUucHJvdG9idWZCC1N0cnVjdFByb3RvUAFaL2dvb2dsZS5nb2xhbmcub3JnL3Byb3RvYnVmL3R5cGVzL2tub3duL3N0cnVjdHBi+AEBogIDR1BCqgIeR29vZ2xlLlByb3RvYnVmLldlbGxLbm93blR5cGVzYgZwcm90bzM");
-/**
-* Describes the message google.protobuf.Struct.
-* Use `create(StructSchema)` to create a new message.
-*/
-const StructSchema = /*@__PURE__*/ messageDesc(file_google_protobuf_struct, 0);
-/**
-* Describes the message google.protobuf.Value.
-* Use `create(ValueSchema)` to create a new message.
-*/
-const ValueSchema = /*@__PURE__*/ messageDesc(file_google_protobuf_struct, 1);
-/**
-* Describes the message google.protobuf.ListValue.
-* Use `create(ListValueSchema)` to create a new message.
-*/
-const ListValueSchema = /*@__PURE__*/ messageDesc(file_google_protobuf_struct, 2);
-/**
-* `NullValue` is a singleton enumeration to represent the null value for the
-* `Value` type union.
-*
-* The JSON representation for `NullValue` is JSON `null`.
-*
-* @generated from enum google.protobuf.NullValue
-*/
-var NullValue;
-(function(NullValue) {
-	/**
-	* Null value.
-	*
-	* @generated from enum value: NULL_VALUE = 0;
-	*/
-	NullValue[NullValue["NULL_VALUE"] = 0] = "NULL_VALUE";
-})(NullValue || (NullValue = {}));
-//#endregion
-//#region node_modules/.pnpm/@bufbuild+protobuf@2.14.0/node_modules/@bufbuild/protobuf/dist/esm/extensions.js
-/**
-* Retrieve an extension value from a message.
-*
-* The function never returns undefined. Use hasExtension() to check whether an
-* extension is set. If the extension is not set, this function returns the
-* default value (if one was specified in the protobuf source), or the zero value
-* (for example `0` for numeric types, `[]` for repeated extension fields, and
-* an empty message instance for message fields).
-*
-* Extensions are stored as unknown fields on a message. To mutate an extension
-* value, make sure to store the new value with setExtension() after mutating.
-*
-* If the extension does not extend the given message, an error is raised.
-*/
-function getExtension(message, extension, options) {
-	assertExtendee(extension, message);
-	const ufs = filterUnknownFields(message.$unknown, extension);
-	const [container, field, get] = createExtensionContainer(extension);
-	const ctx = makeReadContext$1(options);
-	for (const uf of ufs) readField(container, new BinaryReader(uf.data), field, uf.wireType, ctx);
-	return get();
-}
-/**
-* Set an extension value on a message. If the message already has a value for
-* this extension, the value is replaced.
-*
-* If the extension does not extend the given message, an error is raised.
-*/
-function setExtension(message, extension, value) {
-	var _a;
-	assertExtendee(extension, message);
-	const ufs = ((_a = message.$unknown) !== null && _a !== void 0 ? _a : []).filter((uf) => uf.no !== extension.number);
-	const [container, field] = createExtensionContainer(extension, value);
-	const writer = new BinaryWriter();
-	writeField(writer, { writeUnknownFields: true }, container, field);
-	const reader = new BinaryReader(writer.finish());
-	while (reader.pos < reader.len) {
-		const [no, wireType] = reader.tag();
-		const data = reader.skip(wireType, no);
-		ufs.push({
-			no,
-			wireType,
-			data
-		});
-	}
-	message.$unknown = ufs;
-}
-function filterUnknownFields(unknownFields, extension) {
-	if (unknownFields === void 0) return [];
-	if (extension.fieldKind === "enum" || extension.fieldKind === "scalar") {
-		for (let i = unknownFields.length - 1; i >= 0; --i) if (unknownFields[i].no == extension.number) return [unknownFields[i]];
-		return [];
-	}
-	return unknownFields.filter((uf) => uf.no === extension.number);
-}
-/**
-* @private
-*/
-function createExtensionContainer(extension, value) {
-	const localName = extension.typeName;
-	const field = Object.assign(Object.assign({}, extension), {
-		kind: "field",
-		parent: extension.extendee,
-		localName
-	});
-	const desc = Object.assign(Object.assign({}, extension.extendee), {
-		fields: [field],
-		members: [field],
-		oneofs: []
-	});
-	const container = create(desc, value !== void 0 ? { [localName]: value } : void 0);
-	return [
-		reflect(desc, container),
-		field,
-		() => {
-			const value = container[localName];
-			if (value === void 0) {
-				const desc = extension.message;
-				if (isWrapperDesc(desc)) return scalarZeroValue(desc.fields[0].scalar, desc.fields[0].longAsString);
-				return create(desc);
-			}
-			return value;
-		}
-	];
-}
-function assertExtendee(extension, message) {
-	if (extension.extendee.typeName != message.$typeName) throw new Error(`extension ${extension.typeName} can only be applied to message ${extension.extendee.typeName}`);
-}
-//#endregion
-//#region node_modules/.pnpm/@bufbuild+protobuf@2.14.0/node_modules/@bufbuild/protobuf/dist/esm/wkt/json.js
-/**
-* Minimum google.protobuf.Timestamp in milliseconds (inclusive).
-* Only enforced in ProtoJSON.
-*
-* @private
-*/
-const timestampMsMin = /*@__PURE__*/ Date.parse("0001-01-01T00:00:00Z");
-/**
-* Maximum google.protobuf.Timestamp in milliseconds (inclusive).
-* Only enforced in ProtoJSON.
-*
-* @private
-*/
-const timestampMsMax = /*@__PURE__*/ Date.parse("9999-12-31T23:59:59Z");
-//#endregion
-//#region node_modules/.pnpm/@bufbuild+protobuf@2.14.0/node_modules/@bufbuild/protobuf/dist/esm/to-json.js
-const LEGACY_REQUIRED = 3;
-const IMPLICIT$1 = 2;
-const jsonWriteDefaults = {
-	alwaysEmitImplicit: false,
-	enumAsInteger: false,
-	useProtoFieldName: false
-};
-function makeWriteOptions(options) {
-	return options ? Object.assign(Object.assign({}, jsonWriteDefaults), options) : jsonWriteDefaults;
-}
-/**
-* Serialize the message to a JSON value, a JavaScript value that can be
-* passed to JSON.stringify().
-*/
-function toJson(schema, message, options) {
-	return compiledWriter(schema)(makeWriteOptions(options), message);
-}
-const compiledWriters = /* @__PURE__ */ new WeakMap();
-/**
-* Return the compiled encoder for a message, compiling it on first use.
-*/
-function compiledWriter(desc) {
-	let compiled = compiledWriters.get(desc);
-	if (compiled === void 0) compiled = compileMessage$1(desc);
-	return compiled;
-}
-function compileMessage$1(desc) {
-	const typeName = desc.typeName;
-	const writeWkt = compileWkt$1(desc);
-	if (writeWkt !== void 0) {
-		const foreignField = desc.fields[0];
-		const compiledWriter = (opts, message) => {
-			if (message.$typeName !== typeName && foreignField !== void 0) throw new FieldError(foreignField, `cannot use ${foreignField} with message ${message.$typeName}`, "ForeignFieldError");
-			return writeWkt(opts, message);
-		};
-		compiledWriters.set(desc, compiledWriter);
-		return compiledWriter;
-	}
-	const sortedFields = desc.fields.concat().sort((a, b) => a.number - b.number);
-	const foreignField = sortedFields[0];
-	const fieldWriters = [];
-	const compiledWriter = (opts, message) => {
-		if (message.$typeName !== typeName && foreignField !== void 0) throw new FieldError(foreignField, `cannot use ${foreignField} with message ${message.$typeName}`, "ForeignFieldError");
-		const json = {};
-		for (let i = 0; i < fieldWriters.length; i++) fieldWriters[i](opts, message, json);
-		if (opts.registry) writeExtensions(json, opts, opts.registry, message, desc);
-		return json;
-	};
-	compiledWriters.set(desc, compiledWriter);
-	for (const field of sortedFields) fieldWriters.push(compileField(field));
-	return compiledWriter;
-}
-/**
-* Compile an encoder for a well-known type with a custom JSON representation,
-* or return undefined for other messages.
-*/
-function compileWkt$1(desc) {
-	if (!desc.typeName.startsWith("google.protobuf.")) return;
-	switch (desc.typeName) {
-		case "google.protobuf.Any": return (opts, message) => anyToJson(message, opts);
-		case "google.protobuf.Timestamp": return (opts, message) => timestampToJson(message);
-		case "google.protobuf.Duration": return (opts, message) => durationToJson(message);
-		case "google.protobuf.FieldMask": return (opts, message) => fieldMaskToJson(message);
-		case "google.protobuf.Struct": return (opts, message) => structToJson(message);
-		case "google.protobuf.Value": return (opts, message) => valueToJson(message);
-		case "google.protobuf.ListValue": return (opts, message) => listValueToJson(message);
-		default:
-			if (isWrapperDesc(desc)) {
-				const valueField = desc.fields[0];
-				const localName = valueField.localName;
-				const zero = scalarZeroValue(valueField.scalar, false);
-				const writeScalar = compileScalarValue(valueField);
-				return (opts, message) => {
-					const value = message[localName];
-					return writeScalar(opts, value === void 0 ? zero : value);
-				};
-			}
-			return;
-	}
-}
-function compileField(field) {
-	switch (field.fieldKind) {
-		case "scalar":
-		case "enum":
-		case "message": return compileSingularField(field);
-		case "list":
-		case "map": {
-			const writeValue = field.fieldKind == "list" ? compileListValue(field) : compileMapValue(field);
-			const protoName = field.name;
-			const jsonKey = field.jsonName;
-			const localName = field.localName;
-			return (opts, message, json) => {
-				const value = writeValue(opts, message[localName]);
-				if (value !== void 0) json[opts.useProtoFieldName ? protoName : jsonKey] = value;
-			};
-		}
-	}
-}
-/**
-* Compile an encoder for a singular field: the presence check, and the
-* value encoder.
-*/
-function compileSingularField(field) {
-	const writeValue = compileSingularValue(field);
-	const protoName = field.name;
-	const jsonKey = field.jsonName;
-	const localName = field.localName;
-	if (field.oneof) {
-		const oneofLocalName = field.oneof.localName;
-		return (opts, message, json) => {
-			const oneof = message[oneofLocalName];
-			if (oneof.case === localName) json[opts.useProtoFieldName ? protoName : jsonKey] = writeValue(opts, oneof.value);
-		};
-	}
-	if (field.presence != IMPLICIT$1) {
-		const requiredError = field.presence == LEGACY_REQUIRED ? `cannot encode ${field} to JSON: required field not set` : void 0;
-		return (opts, message, json) => {
-			const value = message[localName];
-			if (value !== void 0 && Object.prototype.hasOwnProperty.call(message, localName)) json[opts.useProtoFieldName ? protoName : jsonKey] = writeValue(opts, value);
-			else if (requiredError !== void 0) throw new Error(requiredError);
-		};
-	}
-	if (field.fieldKind == "enum") {
-		const zero = field.enum.values[0].number;
-		return (opts, message, json) => {
-			const value = message[localName];
-			if (value !== zero || opts.alwaysEmitImplicit) json[opts.useProtoFieldName ? protoName : jsonKey] = writeValue(opts, value);
-		};
-	}
-	switch (field.scalar) {
-		case ScalarType.BOOL: return (opts, message, json) => {
-			const value = message[localName];
-			if (value !== false || opts.alwaysEmitImplicit) json[opts.useProtoFieldName ? protoName : jsonKey] = writeValue(opts, value);
-		};
-		case ScalarType.STRING: return (opts, message, json) => {
-			const value = message[localName];
-			if (value !== "" || opts.alwaysEmitImplicit) json[opts.useProtoFieldName ? protoName : jsonKey] = writeValue(opts, value);
-		};
-		case ScalarType.BYTES: return (opts, message, json) => {
-			const value = message[localName];
-			if (!(value instanceof Uint8Array) || value.byteLength > 0 || opts.alwaysEmitImplicit) json[opts.useProtoFieldName ? protoName : jsonKey] = writeValue(opts, value);
-		};
-		case ScalarType.DOUBLE:
-		case ScalarType.FLOAT: return (opts, message, json) => {
-			const value = message[localName];
-			if (!Object.is(value, 0) || opts.alwaysEmitImplicit) json[opts.useProtoFieldName ? protoName : jsonKey] = writeValue(opts, value);
-		};
-		default: return (opts, message, json) => {
-			const value = message[localName];
-			if (value != 0 || opts.alwaysEmitImplicit) json[opts.useProtoFieldName ? protoName : jsonKey] = writeValue(opts, value);
-		};
-	}
-}
-/**
-* Compile an encoder for the value of a field of any kind. Used for
-* extension values.
-*/
-function compileFieldValue(field) {
-	switch (field.fieldKind) {
-		case "scalar":
-		case "enum":
-		case "message": return compileSingularValue(field);
-		case "list": return compileListValue(field);
-		case "map": return compileMapValue(field);
-	}
-}
-/**
-* Compile an encoder for the value of a singular field.
-*/
-function compileSingularValue(field) {
-	switch (field.fieldKind) {
-		case "scalar": return compileScalarValue(field);
-		case "enum": return compileEnumValue(field);
-		case "message": return compileMessageValue(field);
-	}
-}
-/**
-* Compile an encoder for the value of a message field.
-*/
-function compileMessageValue(field) {
-	const { toMessage } = localMessageMapper(field);
-	const writeMessage = compiledWriter(field.message);
-	return (opts, value) => writeMessage(opts, toMessage(value));
-}
-/**
-* Compile an encoder for a list field value. Returns undefined for an empty
-* list, unless alwaysEmitImplicit is enabled.
-*/
-function compileListValue(field) {
-	const writeItem = compileListItemValue(field);
-	return (opts, value) => {
-		const items = value;
-		if (items.length == 0 && !opts.alwaysEmitImplicit) return;
-		const jsonArray = [];
-		for (let i = 0; i < items.length; i++) jsonArray.push(writeItem(opts, items[i]));
-		return jsonArray;
-	};
-}
-function compileListItemValue(field) {
-	switch (field.listKind) {
-		case "scalar": return compileScalarValue(field);
-		case "enum": return compileEnumValue(field);
-		case "message": return compileMessageValue(field);
-	}
-}
-/**
-* Compile an encoder for a map field value. Returns undefined for an empty
-* map, unless alwaysEmitImplicit is enabled. Map keys are stored as object
-* keys and are used as JSON keys as-is.
-*/
-function compileMapValue(field) {
-	const writeMapValue = compileMapEntryValue(field);
-	return (opts, value) => {
-		const record = value;
-		const keys = Object.keys(record);
-		if (keys.length == 0 && !opts.alwaysEmitImplicit) return;
-		const jsonObject = {};
-		for (let i = 0; i < keys.length; i++) {
-			const key = keys[i];
-			jsonObject[key] = writeMapValue(opts, record[key]);
-		}
-		return jsonObject;
-	};
-}
-function compileMapEntryValue(field) {
-	switch (field.mapKind) {
-		case "scalar": return compileScalarValue(field);
-		case "enum": return compileEnumValue(field);
-		case "message": return compileMessageValue(field);
-	}
-}
-/**
-* Compile an encoder for an enum value.
-*/
-function compileEnumValue(field) {
-	const desc = field.enum;
-	if (desc.typeName == "google.protobuf.NullValue") return (opts, value) => {
-		if (typeof value != "number") throw errorEnumValue(desc, value);
-		return null;
-	};
-	return (opts, value) => {
-		var _a, _b;
-		if (typeof value != "number") throw errorEnumValue(desc, value);
-		if (opts.enumAsInteger) return value;
-		return (_b = (_a = desc.value[value]) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : value;
-	};
-}
-function errorEnumValue(desc, value) {
-	return /* @__PURE__ */ new Error(`cannot encode ${desc} to JSON: expected number, got ${formatVal(value)}`);
-}
-/**
-* Compile an encoder for a scalar value. Errors report the original field
-* descriptor, which may be a list or map field for items of those fields.
-*/
-function compileScalarValue(field) {
-	switch (field.scalar) {
-		case ScalarType.INT32:
-		case ScalarType.SFIXED32:
-		case ScalarType.SINT32:
-		case ScalarType.FIXED32:
-		case ScalarType.UINT32: return (opts, value) => {
-			if (typeof value != "number") throw errorScalarValue(field, value);
-			return value;
-		};
-		case ScalarType.FLOAT:
-		case ScalarType.DOUBLE: return (opts, value) => {
-			if (typeof value != "number") throw errorScalarValue(field, value);
-			if (Number.isNaN(value)) return "NaN";
-			if (value === Number.POSITIVE_INFINITY) return "Infinity";
-			if (value === Number.NEGATIVE_INFINITY) return "-Infinity";
-			return value;
-		};
-		case ScalarType.STRING: return (opts, value) => {
-			if (typeof value != "string") throw errorScalarValue(field, value);
-			return value;
-		};
-		case ScalarType.BOOL: return (opts, value) => {
-			if (typeof value != "boolean") throw errorScalarValue(field, value);
-			return value;
-		};
-		case ScalarType.UINT64:
-		case ScalarType.FIXED64:
-		case ScalarType.INT64:
-		case ScalarType.SFIXED64:
-		case ScalarType.SINT64: return (opts, value) => {
-			if (typeof value == "bigint" || typeof value == "string" || typeof value == "number" && Number.isInteger(value)) return value.toString();
-			throw errorScalarValue(field, value);
-		};
-		case ScalarType.BYTES: return (opts, value) => {
-			if (value instanceof Uint8Array) return base64Encode(value);
-			throw errorScalarValue(field, value);
-		};
-	}
-}
-function errorScalarValue(field, value) {
-	var _a;
-	return /* @__PURE__ */ new Error(`cannot encode ${field} to JSON: ${(_a = checkField(field, value)) === null || _a === void 0 ? void 0 : _a.message}`);
-}
-/**
-* Write extensions for unknown fields that are found in the registry.
-*/
-function writeExtensions(json, opts, registry, message, desc) {
-	const unknown = message.$unknown;
-	if (unknown === void 0) return;
-	const tagSeen = /* @__PURE__ */ new Set();
-	for (let i = 0; i < unknown.length; i++) {
-		const { no } = unknown[i];
-		if (!tagSeen.has(no)) {
-			tagSeen.add(no);
-			const extension = registry.getExtensionFor(desc, no);
-			if (!extension) continue;
-			const [container, field] = createExtensionContainer(extension, getExtension(message, extension));
-			const local = container[unsafeLocal];
-			const jsonValue = compileFieldValue(field)(opts, local[field.localName]);
-			if (jsonValue !== void 0) json[extension.jsonName] = jsonValue;
-		}
-	}
-}
-function anyToJson(val, opts) {
-	if (val.typeUrl === "") return {};
-	const { registry } = opts;
-	let message;
-	let desc;
-	if (registry) {
-		message = anyUnpack(val, registry);
-		if (message) desc = registry.getMessage(message.$typeName);
-	}
-	if (!desc || !message) throw new Error(`cannot encode message ${val.$typeName} to JSON: "${val.typeUrl}" is not in the type registry`);
-	const json = hasCustomJsonRepresentation(desc) ? { value: compiledWriter(desc)(opts, message) } : compiledWriter(desc)(opts, message);
-	json["@type"] = val.typeUrl;
-	return json;
-}
-function durationToJson(val) {
-	const seconds = Number(val.seconds);
-	const nanos = val.nanos;
-	if (seconds > 315576e6 || seconds < -315576e6) throw new Error(`cannot encode message ${val.$typeName} to JSON: value out of range`);
-	if (seconds > 0 && nanos < 0 || seconds < 0 && nanos > 0) throw new Error(`cannot encode message ${val.$typeName} to JSON: nanos sign must match seconds sign`);
-	let text = val.seconds.toString();
-	if (nanos !== 0) {
-		let nanosStr = Math.abs(nanos).toString();
-		nanosStr = "0".repeat(9 - nanosStr.length) + nanosStr;
-		if (nanosStr.substring(3) === "000000") nanosStr = nanosStr.substring(0, 3);
-		else if (nanosStr.substring(6) === "000") nanosStr = nanosStr.substring(0, 6);
-		text += "." + nanosStr;
-		if (nanos < 0 && seconds == 0) text = "-" + text;
-	}
-	return text + "s";
-}
-function fieldMaskToJson(val) {
-	return val.paths.map((p) => {
-		if (protoSnakeCase(protoCamelCase(p)) !== p) throw new Error(`cannot encode message ${val.$typeName} to JSON: lowerCamelCase of path name "${p}" is irreversible`);
-		return protoCamelCase(p);
-	}).join(",");
-}
-function structToJson(val) {
-	const json = {};
-	const keys = Object.keys(val.fields);
-	for (let i = 0; i < keys.length; i++) {
-		const key = keys[i];
-		json[key] = valueToJson(val.fields[key]);
-	}
-	return json;
-}
-function valueToJson(val) {
-	switch (val.kind.case) {
-		case "nullValue": return null;
-		case "numberValue":
-			if (!Number.isFinite(val.kind.value)) throw new Error(`${val.$typeName} cannot be NaN or Infinity`);
-			return val.kind.value;
-		case "boolValue": return val.kind.value;
-		case "stringValue": return val.kind.value;
-		case "structValue": return structToJson(val.kind.value);
-		case "listValue": return listValueToJson(val.kind.value);
-		default: throw new Error(`${val.$typeName} must have a value`);
-	}
-}
-function listValueToJson(val) {
-	return val.values.map(valueToJson);
-}
-function timestampToJson(val) {
-	const ms = Number(val.seconds) * 1e3;
-	if (ms < timestampMsMin || ms > timestampMsMax) throw new Error(`cannot encode message ${val.$typeName} to JSON: must be from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59Z inclusive`);
-	if (val.nanos < 0) throw new Error(`cannot encode message ${val.$typeName} to JSON: nanos must not be negative`);
-	if (val.nanos > 999999999) throw new Error(`cannot encode message ${val.$typeName} to JSON: nanos must not be greater than 99999999`);
-	let z = "Z";
-	if (val.nanos > 0) {
-		const nanosStr = (val.nanos + 1e9).toString().substring(1);
-		if (nanosStr.substring(3) === "000000") z = "." + nanosStr.substring(0, 3) + "Z";
-		else if (nanosStr.substring(6) === "000") z = "." + nanosStr.substring(0, 6) + "Z";
-		else z = "." + nanosStr + "Z";
-	}
-	return new Date(ms).toISOString().replace(".000Z", z);
-}
-//#endregion
-//#region node_modules/.pnpm/@bufbuild+protobuf@2.14.0/node_modules/@bufbuild/protobuf/dist/esm/from-json.js
-const IMPLICIT = 2;
-function makeReadContext(options) {
-	return Object.assign(Object.assign({
-		ignoreUnknownFields: false,
-		recursionLimit: 100
-	}, options), { depth: 0 });
-}
-/**
-* Parse a message from a JSON value.
-*
-* Duplicate keys are rejected, but a value parsed by JSON.parse has already
-* dropped duplicates (the last one wins). Use `fromJsonString` for strict
-* duplicate-key checking.
-*/
-function fromJson(schema, json, options) {
-	const message = create(schema);
-	readMessage(schema, message, json, options);
-	return message;
+/** Messages that carry no diagnostic content on their own. */
+const GENERIC_CONNECT_ERROR_MESSAGES = /* @__PURE__ */ new Set([
+	"",
+	"error",
+	"unknown",
+	"unknown error",
+	"internal",
+	"internal error"
+]);
+/** Upper bound for appended trailer context so errors stay log-line sized. */
+const MAX_EXTRA_DETAIL_CHARS = 400;
+function isRecord(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-/**
-* Run the compiled decoder for the message, wrapping FieldErrors with the
-* standard error message.
-*/
-function readMessage(schema, message, json, options) {
+function safeJson(value) {
 	try {
-		compiledReader(schema)(message, json, makeReadContext(options));
-	} catch (e) {
-		if (isFieldError(e)) throw new Error(`cannot decode ${e.field()} from JSON: ${e.message}`, { cause: e });
-		throw e;
-	}
-}
-const compiledReaders = /* @__PURE__ */ new WeakMap();
-/**
-* Return the compiled decoder for a message, compiling it on first use.
-*/
-function compiledReader(desc) {
-	let compiled = compiledReaders.get(desc);
-	if (compiled === void 0) compiled = compileMessage(desc);
-	return compiled;
-}
-function compileMessage(desc) {
-	const descString = String(desc);
-	const readWkt = compileWkt(desc);
-	if (readWkt !== void 0) {
-		const compiled = (message, json, ctx) => {
-			if (++ctx.depth > ctx.recursionLimit) throw new Error(`cannot decode ${descString} from JSON: maximum recursion depth of ${ctx.recursionLimit} reached`);
-			readWkt(message, json, ctx);
-			ctx.depth--;
-		};
-		compiledReaders.set(desc, compiled);
-		return compiled;
-	}
-	const typeName = desc.typeName;
-	const fieldsByJsonKey = /* @__PURE__ */ new Map();
-	const compiled = (message, json, ctx) => {
-		var _a;
-		if (++ctx.depth > ctx.recursionLimit) throw new Error(`cannot decode ${descString} from JSON: maximum recursion depth of ${ctx.recursionLimit} reached`);
-		if (json == null || Array.isArray(json) || typeof json != "object") throw new Error(`cannot decode ${descString} from JSON: ${formatVal(json)}`);
-		const oneofSeen = /* @__PURE__ */ new Map();
-		const fieldSeen = /* @__PURE__ */ new Set();
-		const jsonKeys = Object.keys(json);
-		for (let i = 0; i < jsonKeys.length; i++) {
-			const jsonKey = jsonKeys[i];
-			const jsonValue = json[jsonKey];
-			const entry = fieldsByJsonKey.get(jsonKey);
-			if (entry !== void 0) {
-				const field = entry.field;
-				if (fieldSeen.has(field)) throw new FieldError(field, "set multiple times");
-				fieldSeen.add(field);
-				if (entry.oneofScalarNullSkip && jsonValue === null) continue;
-				if (entry.oneof) {
-					const seen = oneofSeen.get(entry.oneof);
-					if (seen !== void 0) throw new FieldError(entry.oneof, `oneof set multiple times by ${seen.name} and ${field.name}`);
-					oneofSeen.set(entry.oneof, field);
-				}
-				entry.read(message, jsonValue, ctx);
-			} else {
-				const extension = jsonKey.startsWith("[") && jsonKey.endsWith("]") ? (_a = ctx.registry) === null || _a === void 0 ? void 0 : _a.getExtension(jsonKey.substring(1, jsonKey.length - 1)) : void 0;
-				if ((extension === null || extension === void 0 ? void 0 : extension.extendee.typeName) == typeName) {
-					const [container, field, get] = createExtensionContainer(extension);
-					compileFieldReader(field)(container[unsafeLocal], jsonValue, ctx);
-					setExtension(message, extension, get());
-				}
-				if (extension === void 0 && !ctx.ignoreUnknownFields) throw new Error(`cannot decode ${descString} from JSON: key "${jsonKey}" is unknown`);
-			}
-		}
-		ctx.depth--;
-	};
-	compiledReaders.set(desc, compiled);
-	for (const field of desc.fields) {
-		const entry = {
-			read: compileFieldReader(field),
-			field,
-			oneof: field.oneof,
-			oneofScalarNullSkip: field.oneof !== void 0 && field.fieldKind == "scalar"
-		};
-		fieldsByJsonKey.set(field.name, entry).set(field.jsonName, entry);
-	}
-	return compiled;
-}
-/**
-* Compile a decoder for a well-known type with a custom JSON representation,
-* or return undefined for other messages. The recursion limit is enforced by
-* the caller.
-*/
-function compileWkt(desc) {
-	if (!desc.typeName.startsWith("google.protobuf.")) return;
-	switch (desc.typeName) {
-		case "google.protobuf.Any": return (message, json, ctx) => anyFromJson(message, json, ctx);
-		case "google.protobuf.Timestamp": return (message, json) => timestampFromJson(message, json);
-		case "google.protobuf.Duration": return (message, json) => durationFromJson(message, json);
-		case "google.protobuf.FieldMask": return (message, json) => fieldMaskFromJson(message, json);
-		case "google.protobuf.Struct": return (message, json, ctx) => structFromJson(message, json, ctx);
-		case "google.protobuf.Value": return (message, json, ctx) => valueFromJson(message, json, ctx);
-		case "google.protobuf.ListValue": return (message, json, ctx) => listValueFromJson(message, json, ctx);
-		default:
-			if (isWrapperDesc(desc)) {
-				const valueField = desc.fields[0];
-				const localName = valueField.localName;
-				const scalar = valueField.scalar;
-				const longAsString = valueField.longAsString;
-				const readScalar = compileScalarConverter(valueField);
-				return (message, json) => {
-					if (json === null) message[localName] = scalarZeroValue(scalar, longAsString);
-					else message[localName] = readScalar(json);
-				};
-			}
-			return;
-	}
-}
-function compileFieldReader(field) {
-	switch (field.fieldKind) {
-		case "scalar": return compileScalarFieldReader(field);
-		case "enum": return compileEnumFieldReader(field);
-		case "message": return compileMessageFieldReader(field);
-		case "list": return compileListFieldReader(field);
-		case "map": return compileMapFieldReader(field);
-	}
-}
-function compileScalarFieldReader(field) {
-	const readScalar = compileScalarConverter(field);
-	const localName = field.localName;
-	if (field.oneof) {
-		const oneofLocalName = field.oneof.localName;
-		return (message, json) => {
-			message[oneofLocalName] = {
-				case: localName,
-				value: readScalar(json)
-			};
-		};
-	}
-	const clear = compileClear(field);
-	return (message, json) => {
-		if (json === null) clear(message);
-		else message[localName] = readScalar(json);
-	};
-}
-/**
-* Compile a function that resets the field to unset, mirroring the clear
-* operation of the reflect API for fields that are not part of a oneof.
-*/
-function compileClear(field) {
-	const localName = field.localName;
-	if (field.presence != IMPLICIT) return (message) => {
-		delete message[localName];
-	};
-	if (field.fieldKind == "enum") {
-		const zero = field.enum.values[0].number;
-		return (message) => {
-			message[localName] = zero;
-		};
-	}
-	const scalar = field.scalar;
-	const longAsString = field.longAsString;
-	return (message) => {
-		message[localName] = scalarZeroValue(scalar, longAsString);
-	};
-}
-function compileEnumFieldReader(field) {
-	const readEnumValue = compileEnumConverter(field.enum);
-	const checkEnum = compileEnumCheck(field.enum);
-	const localName = field.localName;
-	const nullResets = field.enum.typeName != "google.protobuf.NullValue";
-	if (field.oneof) {
-		const oneofLocalName = field.oneof.localName;
-		return (message, json, ctx) => {
-			if (json === null && nullResets) {
-				if (message[oneofLocalName].case === localName) message[oneofLocalName] = { case: void 0 };
-				return;
-			}
-			const value = readEnumValue(json, ctx.ignoreUnknownFields);
-			if (value === tokenIgnoredUnknownEnum) return;
-			const check = checkEnum(value);
-			if (check !== true) throw new FieldError(field, reasonSingular(field, value, check));
-			message[oneofLocalName] = {
-				case: localName,
-				value
-			};
-		};
-	}
-	const clear = compileClear(field);
-	return (message, json, ctx) => {
-		if (json === null && nullResets) {
-			clear(message);
-			return;
-		}
-		const value = readEnumValue(json, ctx.ignoreUnknownFields);
-		if (value === tokenIgnoredUnknownEnum) return;
-		const check = checkEnum(value);
-		if (check !== true) throw new FieldError(field, reasonSingular(field, value, check));
-		message[localName] = value;
-	};
-}
-function compileMessageFieldReader(field) {
-	const localName = field.localName;
-	const { toMessage, toLocal } = localMessageMapper(field);
-	const readChild = compiledReader(field.message);
-	const nullResets = field.message.typeName != "google.protobuf.Value";
-	if (field.oneof) {
-		const oneofLocalName = field.oneof.localName;
-		return (message, json, ctx) => {
-			const oneof = message[oneofLocalName];
-			if (json === null && nullResets) {
-				if (oneof.case === localName) message[oneofLocalName] = { case: void 0 };
-				return;
-			}
-			const child = toMessage(oneof.case === localName ? oneof.value : void 0);
-			readChild(child, json, ctx);
-			message[oneofLocalName] = {
-				case: localName,
-				value: toLocal(child)
-			};
-		};
+		return (typeof value === "string" ? value : JSON.stringify(value)) || void 0;
+	} catch {
+		return;
 	}
-	return (message, json, ctx) => {
-		if (json === null && nullResets) {
-			delete message[localName];
-			return;
-		}
-		const child = toMessage(message[localName]);
-		readChild(child, json, ctx);
-		message[localName] = toLocal(child);
-	};
-}
-function compileListFieldReader(field) {
-	const localName = field.localName;
-	const readItem = compileListItemReader(field);
-	return (message, json, ctx) => {
-		if (json === null) return;
-		if (!Array.isArray(json)) throw new FieldError(field, "expected Array, got " + formatVal(json));
-		const items = message[localName];
-		for (let i = 0; i < json.length; i++) {
-			const value = readItem(json[i], ctx, items.length);
-			if (value !== tokenIgnoredUnknownEnum) items.push(value);
-		}
-	};
 }
 /**
-* Compile a decoder for a list item. The index is only used in errors, and
-* accounts for previously merged items.
+* Summarizes Connect error detail entries (objects with type / value / debug
+* fields per the Connect JSON error model). Returns undefined when nothing
+* usable is present.
 */
-function compileListItemReader(field) {
-	switch (field.listKind) {
-		case "scalar": {
-			const parseScalar = compileScalarParse(field);
-			const checkValue = checkScalarValue(field.scalar);
-			const toLocal = compileScalarToLocal(field);
-			return (json, ctx, index) => {
-				if (json === null) throw new FieldError(field, "list item must not be null");
-				const value = parseScalar(json);
-				const check = checkValue(value);
-				if (check !== true) throw new FieldError(field, `list item #${index + 1}: ${reasonSingular(field, value, check)}`);
-				return toLocal(value);
-			};
-		}
-		case "enum": {
-			const readEnumValue = compileEnumConverter(field.enum);
-			const checkEnum = compileEnumCheck(field.enum);
-			const nullResets = field.enum.typeName != "google.protobuf.NullValue";
-			return (json, ctx, index) => {
-				if (json === null && nullResets) throw new FieldError(field, "list item must not be null");
-				const value = readEnumValue(json, ctx.ignoreUnknownFields);
-				if (value === tokenIgnoredUnknownEnum) return value;
-				const check = checkEnum(value);
-				if (check !== true) throw new FieldError(field, `list item #${index + 1}: ${reasonSingular(field, value, check)}`);
-				return value;
-			};
-		}
-		case "message": {
-			const { toMessage, toLocal } = localMessageMapper(field);
-			const readChild = compiledReader(field.message);
-			const nullResets = field.message.typeName != "google.protobuf.Value";
-			return (json, ctx) => {
-				if (json === null && nullResets) throw new FieldError(field, "list item must not be null");
-				const child = toMessage(void 0);
-				readChild(child, json, ctx);
-				return toLocal(child);
-			};
-		}
+function summarizeConnectErrorDetails(details) {
+	if (!Array.isArray(details) || details.length === 0) return void 0;
+	const parts = [];
+	for (const entry of details) {
+		if (!isRecord(entry)) continue;
+		const type = typeof entry.type === "string" && entry.type ? entry.type : void 0;
+		const debug = entry.debug !== void 0 ? safeJson(entry.debug) : void 0;
+		const value = entry.value !== void 0 ? safeJson(entry.value) : void 0;
+		const diagnostic = debug ?? value;
+		if (type && diagnostic) parts.push(`${type}: ${diagnostic}`);
+		else if (type) parts.push(type);
+		else if (diagnostic) parts.push(diagnostic);
 	}
+	if (parts.length === 0) return void 0;
+	return truncate(parts.join("; "), MAX_EXTRA_DETAIL_CHARS);
 }
-function compileMapFieldReader(field) {
-	const localName = field.localName;
-	const mapKey = field.mapKey;
-	const parseMapKey = compileMapKeyParse(mapKey);
-	const checkMapKey = checkScalarValue(mapKey);
-	let parseValue;
-	let checkValue;
-	let toLocalValue = (value) => value;
-	let nullResets = true;
-	switch (field.mapKind) {
-		case "scalar":
-			parseValue = compileScalarParse(field);
-			checkValue = checkScalarValue(field.scalar);
-			toLocalValue = compileScalarToLocal(field);
-			break;
-		case "enum": {
-			const readEnumValue = compileEnumConverter(field.enum);
-			parseValue = (json, ctx) => readEnumValue(json, ctx.ignoreUnknownFields);
-			checkValue = compileEnumCheck(field.enum);
-			nullResets = field.enum.typeName != "google.protobuf.NullValue";
-			break;
-		}
-		case "message": {
-			const { toMessage, toLocal } = localMessageMapper(field);
-			const readChild = compiledReader(field.message);
-			nullResets = field.message.typeName != "google.protobuf.Value";
-			parseValue = (json, ctx) => {
-				const child = toMessage(void 0);
-				readChild(child, json, ctx);
-				return toLocal(child);
-			};
-			break;
-		}
-	}
-	return (message, json, ctx) => {
-		if (json === null) return;
-		if (typeof json != "object" || Array.isArray(json)) throw new FieldError(field, "expected object, got " + formatVal(json));
-		const record = message[localName];
-		const seen = /* @__PURE__ */ new Set();
-		const jsonMapKeys = Object.keys(json);
-		for (let i = 0; i < jsonMapKeys.length; i++) {
-			const jsonMapKey = jsonMapKeys[i];
-			const jsonMapValue = json[jsonMapKey];
-			const key = parseMapKey(jsonMapKey);
-			if (seen.has(key)) throw new FieldError(field, `duplicate map key "${jsonMapKey}"`);
-			seen.add(key);
-			if (jsonMapValue === null && nullResets) throw new FieldError(field, "map value must not be null");
-			const value = parseValue(jsonMapValue, ctx);
-			if (value === tokenIgnoredUnknownEnum) continue;
-			const checkKey = checkMapKey(key);
-			if (checkKey !== true) throw new FieldError(field, `invalid map key: ${reasonSingular({ scalar: mapKey }, key, checkKey)}`);
-			if (checkValue !== void 0) {
-				const check = checkValue(value);
-				if (check !== true) throw new FieldError(field, `map entry ${formatVal(key)}: ${reasonSingular(field, value, check)}`);
-			}
-			record[key] = toLocalValue(value);
-		}
-	};
-}
-const tokenIgnoredUnknownEnum = Symbol();
 /**
-* Compile a converter from a JSON value to an enum value. JSON null returns
-* the enum's first value. With ignoreUnknownFields false, unknown string
-* values raise an error; with true, they return tokenIgnoredUnknownEnum.
-* The value is not checked against the enum's values, see compileEnumCheck.
+* Formats a Connect end-stream error object into a diagnosable message.
+* The "Connect error code: message" prefix is preserved exactly; detail
+* entries are appended when present, and when the message itself is generic
+* the remaining trailer fields are inlined so the error names what the
+* server actually sent instead of a bare "Error".
 */
-function compileEnumConverter(desc) {
-	const zero = desc.values[0].number;
-	const values = desc.values;
-	return (json, ignoreUnknownFields) => {
-		if (json === null) return zero;
-		switch (typeof json) {
-			case "number":
-				if (Number.isInteger(json)) return json;
-				break;
-			case "string": {
-				const value = values.find((ev) => ev.name === json);
-				if (value !== void 0) return value.number;
-				if (ignoreUnknownFields) return tokenIgnoredUnknownEnum;
-				break;
-			}
+function formatConnectEndStreamError(error) {
+	const record = isRecord(error) ? error : {};
+	const code = typeof record.code === "string" && record.code ? record.code : "unknown";
+	const message = typeof record.message === "string" ? record.message : "";
+	const detail = summarizeConnectErrorDetails(record.details);
+	const parts = [`Connect error ${code}: ${message || "Unknown error"}`];
+	if (detail) parts.push(`[details: ${detail}]`);
+	else if (GENERIC_CONNECT_ERROR_MESSAGES.has(message.trim().toLowerCase())) {
+		const extras = {};
+		for (const [key, value] of Object.entries(record)) {
+			if (key === "code" || key === "message") continue;
+			extras[key] = value;
 		}
-		throw new Error(`cannot decode ${desc} from JSON: ${formatVal(json)}`);
-	};
-}
-/**
-* Compile the check that the reflect API performs for enum values: open
-* enums accept any int32 value, closed enums accept only declared values.
-*/
-function compileEnumCheck(desc) {
-	if (desc.open) return checkScalarValue(ScalarType.INT32);
-	const values = desc.values;
-	return (value) => values.some((v) => v.number === value);
-}
-/**
-* Compile a converter from a JSON value to the local representation of a
-* scalar, fusing JSON parsing, the validation of the reflect API, and the
-* conversion to the local 64-bit integer representation.
-*/
-function compileScalarConverter(field) {
-	const parseScalar = compileScalarParse(field);
-	const checkValue = checkScalarValue(field.scalar);
-	const toLocal = compileScalarToLocal(field);
-	return (json) => {
-		const value = parseScalar(json);
-		const check = checkValue(value);
-		if (check !== true) throw new FieldError(field, reasonSingular(field, value, check));
-		return toLocal(value);
-	};
-}
-/**
-* Compile the JSON-specific parsing step for a scalar value: the special
-* string values of float and double, string-encoded numbers, and base64
-* bytes. Returns the input unchanged if the JSON value cannot be converted;
-* the validation step raises an error for it.
-*/
-function compileScalarParse(field) {
-	switch (field.scalar) {
-		case ScalarType.DOUBLE:
-		case ScalarType.FLOAT: return (json) => {
-			if (json === "NaN") return NaN;
-			if (json === "Infinity") return Number.POSITIVE_INFINITY;
-			if (json === "-Infinity") return Number.NEGATIVE_INFINITY;
-			if (typeof json == "number") {
-				if (Number.isNaN(json)) throw new FieldError(field, "unexpected NaN number");
-				if (!Number.isFinite(json)) throw new FieldError(field, "unexpected infinite number");
-				return json;
-			}
-			if (typeof json == "string") {
-				if (json === "") return json;
-				if (json.trim().length !== json.length) return json;
-				const float = Number(json);
-				if (!Number.isFinite(float)) return json;
-				return float;
-			}
-			return json;
-		};
-		case ScalarType.INT32:
-		case ScalarType.FIXED32:
-		case ScalarType.SFIXED32:
-		case ScalarType.SINT32:
-		case ScalarType.UINT32: return int32FromJson;
-		case ScalarType.BYTES: return (json) => {
-			if (typeof json == "string") {
-				if (json === "") return /* @__PURE__ */ new Uint8Array(0);
-				try {
-					return base64Decode(json);
-				} catch (e) {
-					const message = e instanceof Error ? e.message : String(e);
-					throw new FieldError(field, message);
-				}
-			}
-			return json;
-		};
-		default: return (json) => json;
-	}
-}
-/**
-* Compile the conversion of a validated scalar value to its local
-* representation: 64-bit integers become bigint, or string with the
-* longAsString option.
-*/
-function compileScalarToLocal(field) {
-	const longAsString = field.fieldKind !== "map" && field.longAsString;
-	switch (field.scalar) {
-		case ScalarType.INT64:
-		case ScalarType.SFIXED64:
-		case ScalarType.SINT64:
-			if (longAsString) return (value) => String(value);
-			return (value) => typeof value == "string" || typeof value == "number" ? protoInt64.parse(value) : value;
-		case ScalarType.FIXED64:
-		case ScalarType.UINT64:
-			if (longAsString) return (value) => String(value);
-			return (value) => typeof value == "string" || typeof value == "number" ? protoInt64.uParse(value) : value;
-		default: return (value) => value;
-	}
-}
-/**
-* Return a parser from a JSON value to a map key for the given key type.
-* Canonicalizes 64-bit integers given as string, so that "01" and "1" are
-* one key, and duplicates can raise an error.
-* The parser returns the input if the JSON value cannot be converted.
-*/
-function compileMapKeyParse(type) {
-	switch (type) {
-		case ScalarType.BOOL: return (jsonString) => {
-			switch (jsonString) {
-				case "true": return true;
-				case "false": return false;
-			}
-			return jsonString;
-		};
-		case ScalarType.INT32:
-		case ScalarType.FIXED32:
-		case ScalarType.UINT32:
-		case ScalarType.SFIXED32:
-		case ScalarType.SINT32: return int32FromJson;
-		case ScalarType.INT64:
-		case ScalarType.SINT64:
-		case ScalarType.SFIXED64:
-		case ScalarType.UINT64:
-		case ScalarType.FIXED64: return (jsonString) => /^-?0+$/.test(jsonString) ? "0" : jsonString.replace(/^(-?)0+(?=\d)/, "$1");
-		default: return (jsonString) => jsonString;
-	}
-}
-/**
-* Try to parse a JSON value to a 32-bit integer for the reflect API.
-*
-* Returns the input if the JSON value cannot be converted.
-*/
-function int32FromJson(json) {
-	if (typeof json == "string") {
-		if (json === "") return json;
-		if (json.trim().length !== json.length) return json;
-		const num = Number(json);
-		if (Number.isNaN(num)) return json;
-		return num;
-	}
-	return json;
-}
-function anyFromJson(any, json, ctx) {
-	var _a;
-	if (json === null || Array.isArray(json) || typeof json != "object") throw new Error(`cannot decode message ${any.$typeName} from JSON: expected object but got ${formatVal(json)}`);
-	if (Object.keys(json).length == 0) return;
-	const typeUrl = json["@type"];
-	if (typeof typeUrl != "string" || typeUrl == "") throw new Error(`cannot decode message ${any.$typeName} from JSON: "@type" is empty`);
-	const typeName = typeUrl.includes("/") ? typeUrl.substring(typeUrl.lastIndexOf("/") + 1) : typeUrl;
-	if (!typeName.length) throw new Error(`cannot decode message ${any.$typeName} from JSON: "@type" is invalid`);
-	const desc = (_a = ctx.registry) === null || _a === void 0 ? void 0 : _a.getMessage(typeName);
-	if (!desc) throw new Error(`cannot decode message ${any.$typeName} from JSON: ${typeUrl} is not in the type registry`);
-	const message = create(desc);
-	if (hasCustomJsonRepresentation(desc) && Object.prototype.hasOwnProperty.call(json, "value")) compiledReader(desc)(message, json.value, ctx);
-	else {
-		const copy = Object.assign({}, json);
-		delete copy["@type"];
-		compiledReader(desc)(message, copy, ctx);
-	}
-	anyPack(desc, message, any);
-}
-function timestampFromJson(timestamp, json) {
-	if (typeof json !== "string") throw new Error(`cannot decode message ${timestamp.$typeName} from JSON: ${formatVal(json)}`);
-	const matches = json.match(/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(?:\.([0-9]{1,9}))?(?:Z|([+-][0-9][0-9]:[0-9][0-9]))$/);
-	if (!matches) throw new Error(`cannot decode message ${timestamp.$typeName} from JSON: invalid RFC 3339 string`);
-	const ms = Date.parse(matches[1] + "-" + matches[2] + "-" + matches[3] + "T" + matches[4] + ":" + matches[5] + ":" + matches[6] + (matches[8] ? matches[8] : "Z"));
-	if (Number.isNaN(ms)) throw new Error(`cannot decode message ${timestamp.$typeName} from JSON: invalid RFC 3339 string`);
-	if (ms < timestampMsMin || ms > timestampMsMax) throw new Error(`cannot decode message ${timestamp.$typeName} from JSON: must be from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59Z inclusive`);
-	timestamp.seconds = protoInt64.parse(ms / 1e3);
-	timestamp.nanos = 0;
-	if (matches[7]) timestamp.nanos = parseInt("1" + matches[7] + "0".repeat(9 - matches[7].length)) - 1e9;
-}
-function durationFromJson(duration, json) {
-	if (typeof json !== "string") throw new Error(`cannot decode message ${duration.$typeName} from JSON: ${formatVal(json)}`);
-	const match = json.match(/^(-?[0-9]+)(?:\.([0-9]+))?s/);
-	if (match === null) throw new Error(`cannot decode message ${duration.$typeName} from JSON: ${formatVal(json)}`);
-	const longSeconds = Number(match[1]);
-	if (longSeconds > 315576e6 || longSeconds < -315576e6) throw new Error(`cannot decode message ${duration.$typeName} from JSON: ${formatVal(json)}`);
-	duration.seconds = protoInt64.parse(longSeconds);
-	if (typeof match[2] !== "string") return;
-	const nanosStr = match[2] + "0".repeat(9 - match[2].length);
-	duration.nanos = parseInt(nanosStr);
-	if (longSeconds < 0 || Object.is(longSeconds, -0)) duration.nanos = -duration.nanos;
-}
-function fieldMaskFromJson(fieldMask, json) {
-	if (typeof json !== "string") throw new Error(`cannot decode message ${fieldMask.$typeName} from JSON: ${formatVal(json)}`);
-	if (json === "") return;
-	fieldMask.paths = json.split(",").map((path) => {
-		if (path.includes("_")) throw new Error(`cannot decode message ${fieldMask.$typeName} from JSON: path names must be lowerCamelCase`);
-		return protoSnakeCase(path);
-	});
-}
-function structFromJson(struct, json, ctx) {
-	if (typeof json != "object" || json == null || Array.isArray(json)) throw new Error(`cannot decode message ${struct.$typeName} from JSON ${formatVal(json)}`);
-	const keys = Object.keys(json);
-	for (let i = 0; i < keys.length; i++) {
-		const key = keys[i];
-		const parsedValue = create(ValueSchema);
-		valueFromJson(parsedValue, json[key], ctx);
-		struct.fields[key] = parsedValue;
-	}
-}
-function valueFromJson(value, json, ctx) {
-	if (++ctx.depth > ctx.recursionLimit) throw new Error(`cannot decode ${value.$typeName} from JSON: maximum recursion depth of ${ctx.recursionLimit} reached`);
-	switch (typeof json) {
-		case "number":
-			value.kind = {
-				case: "numberValue",
-				value: json
-			};
-			break;
-		case "string":
-			value.kind = {
-				case: "stringValue",
-				value: json
-			};
-			break;
-		case "boolean":
-			value.kind = {
-				case: "boolValue",
-				value: json
-			};
-			break;
-		case "object":
-			if (json === null) value.kind = {
-				case: "nullValue",
-				value: NullValue.NULL_VALUE
-			};
-			else if (Array.isArray(json)) {
-				const listValue = create(ListValueSchema);
-				listValueFromJson(listValue, json, ctx);
-				value.kind = {
-					case: "listValue",
-					value: listValue
-				};
-			} else {
-				const struct = create(StructSchema);
-				structFromJson(struct, json, ctx);
-				value.kind = {
-					case: "structValue",
-					value: struct
-				};
-			}
-			break;
-		default: throw new Error(`cannot decode message ${value.$typeName} from JSON ${formatVal(json)}`);
-	}
-	ctx.depth--;
-	return value;
-}
-function listValueFromJson(listValue, json, ctx) {
-	if (!Array.isArray(json)) throw new Error(`cannot decode message ${listValue.$typeName} from JSON ${formatVal(json)}`);
-	for (let i = 0; i < json.length; i++) {
-		const value = create(ValueSchema);
-		valueFromJson(value, json[i], ctx);
-		listValue.values.push(value);
+		const raw = Object.keys(extras).length > 0 ? safeJson(extras) : void 0;
+		if (raw && raw !== "{}") parts.push(`[trailer: ${truncate(raw, MAX_EXTRA_DETAIL_CHARS)}]`);
 	}
+	return parts.join(" ");
 }
 //#endregion
-//#region node_modules/.pnpm/@oh-my-pi+pi-ai@17.3.5/node_modules/@oh-my-pi/pi-ai/src/providers/cursor-pi-args.ts
+//#region node_modules/.pnpm/@oh-my-pi+pi-ai@18.1.17/node_modules/@oh-my-pi/pi-ai/src/providers/cursor-external-tool-handoff.md
+var cursor_external_tool_handoff_default = "Tool call received and handed off to the external client for execution. Do not retry or call it again; end the turn. The result will be provided in the next request.\n";
+//#endregion
+//#region node_modules/.pnpm/@oh-my-pi+pi-ai@18.1.17/node_modules/@oh-my-pi/pi-ai/src/providers/cursor-pi-args.ts
 /**
 * Translate a Pi frame's args into the local tool kwargs that run it.
 *
@@ -1684,7 +116,7 @@ function listValueFromJson(listValue, json, ctx) {
 *
 * Kept apart from `cursor/exec-modern.ts` on purpose: these are pure
 * string/path functions with no protobuf coupling, while that module pulls in
-* `@bufbuild/protobuf` and the generated `agent_pb` graph. The legacy shim is
+* the generated cursor protobuf graph. The legacy shim is
 * compiled into the bundled virtual module registry, so importing it from a
 * nested path would drag the whole exec implementation in with it — and
 * `./providers/*` is a single-segment wildcard export that cannot serve a
@@ -1715,8 +147,9 @@ function piReadPath(readPath, offset, limit) {
 	const start = offset !== void 0 ? Math.max(1, Math.floor(offset)) : void 0;
 	const count = limit !== void 0 ? Math.floor(limit) : void 0;
 	if (start === void 0 && count === void 0) return readPath;
-	if (start === void 0) return `${readPath}:raw:1+${count}`;
-	return count === void 0 ? `${readPath}:raw:${start}-` : `${readPath}:raw:${start}+${count}`;
+	const base = readPath.split(":").some((chunk) => chunk.toLowerCase() === "raw") ? readPath : `${readPath}:raw`;
+	if (start === void 0) return `${base}:1+${count}`;
+	return count === void 0 ? `${base}:${start}-` : `${base}:${start}+${count}`;
 }
 const READ_RANGE_CHUNK_RE = /^L?(\d+)(?:(\.\.|[-+])L?(\d+)?)?$/i;
 function isReadRangeList(value) {
@@ -1746,6 +179,39 @@ function piReadPathHasRange(readPath) {
 	return preceding !== void 0 && isReadRangeList(preceding);
 }
 /**
+* Force a Cursor exec read onto `read`'s verbatim `:raw` selector.
+*
+* Native `editToolCall` (StrReplace) materializes via `readArgs` then
+* `writeArgs`. The server treats the read result as file bytes and writes
+* them back. A hashline-formatted native read (`[path#TAG]` + `LINE:`
+* prefixes) poisons that cycle: the write would persist the markup.
+* `:raw` is the existing selector that drops both. A path that already
+* carries `raw` is left alone; a range-only selector gets `raw` inserted
+* so the range still applies without the gutter.
+*/
+function cursorRawReadPath(readPath) {
+	const chunks = readPath.split(":");
+	if (chunks.some((chunk) => chunk.toLowerCase() === "raw")) return readPath;
+	if (piReadPathHasRange(readPath)) {
+		const last = chunks.pop();
+		return `${chunks.join(":")}:raw:${last}`;
+	}
+	return `${readPath}:raw`;
+}
+/**
+* Path the edit-owned materialization read should execute.
+*
+* Range is composed first (`piReadPath` already uses `:raw` for a range),
+* then a whole-file path is forced onto `:raw`. The caller must drop
+* `offset`/`limit` after this so the bridge's `piReadPath` cannot append a
+* second `:raw` onto the already-composed selector.
+*/
+function cursorEditOwnedReadPath(readPath, offset, limit) {
+	const ranged = piReadPath(readPath, offset, limit);
+	if (ranged === null) return null;
+	return cursorRawReadPath(ranged);
+}
+/**
 * The same range as {@link piReadPath}, rendered for a transcript block rather
 * than for execution.
 *
@@ -1844,7 +310,7 @@ function omitUndefinedArgs(args) {
 	return out;
 }
 //#endregion
-//#region node_modules/.pnpm/@oh-my-pi+pi-ai@17.3.5/node_modules/@oh-my-pi/pi-ai/src/providers/cursor/exec-modern.ts
+//#region node_modules/.pnpm/@oh-my-pi+pi-ai@18.1.17/node_modules/@oh-my-pi/pi-ai/src/providers/cursor/exec-modern.ts
 /**
 * Proto builders for the modern Cursor CLI exec frames (`ExecServerMessage`
 * 27-31, 36-38, 40-55).
@@ -2236,7 +702,178 @@ function buildNeutralHookResult(request) {
 			break;
 		default: return null;
 	}
-	return create(ExecuteHookResultSchema, { response });
+	return create(ExecuteHookResultSchema, { response });
+}
+//#endregion
+//#region node_modules/.pnpm/@oh-my-pi+pi-ai@18.1.17/node_modules/@oh-my-pi/pi-ai/src/providers/cursor/interaction-query.ts
+const NOT_IMPLEMENTED_SUFFIX$1 = "not implemented by this client";
+function frameConnectMessage$1(data, flags = 0) {
+	const frame = Buffer.alloc(5 + data.length);
+	frame[0] = flags;
+	frame.writeUInt32BE(data.length, 1);
+	frame.set(data, 5);
+	return frame;
+}
+function isProtoUnknownField(value) {
+	if (!value || typeof value !== "object") return false;
+	if (!("no" in value) || !("wireType" in value) || !("data" in value)) return false;
+	return typeof value.no === "number" && typeof value.wireType === "number" && value.data instanceof Uint8Array;
+}
+function protoUnknownFields$1(message) {
+	if (!("$unknown" in message) || !Array.isArray(message.$unknown)) return [];
+	return message.$unknown.filter(isProtoUnknownField);
+}
+function attachUnknownApprovedField(response, fieldNo) {
+	const bag = response;
+	const field = {
+		no: fieldNo,
+		wireType: 2,
+		data: new Uint8Array([
+			2,
+			10,
+			0
+		])
+	};
+	const existing = bag.$unknown;
+	if (Array.isArray(existing)) {
+		existing.push(field);
+		return;
+	}
+	bag.$unknown = [field];
+}
+function log$1(type, subtype, data) {
+	if (!$env.DEBUG_CURSOR) return;
+	const dataStr = ($env.DEBUG_CURSOR === "2" || $env.DEBUG_CURSOR === "verbose") && data ? ` ${JSON.stringify(data)?.slice(0, 500)}` : "";
+	console.error(`[CURSOR] ${type}${subtype ? `: ${subtype}` : ""}${dataStr}`);
+}
+function sendInteractionResponse(h2Request, queryId, result) {
+	const response = create(InteractionResponseSchema, {
+		id: queryId,
+		result
+	});
+	const clientMessage = create(AgentClientMessageSchema, { message: {
+		case: "interactionResponse",
+		value: response
+	} });
+	h2Request.write(frameConnectMessage$1(toBinary(AgentClientMessageSchema, clientMessage)));
+	log$1("interactionResponse", result.case, { id: queryId });
+}
+function sendUnknownApprovedInteractionResponse(h2Request, queryId, fieldNo) {
+	const response = create(InteractionResponseSchema, { id: queryId });
+	attachUnknownApprovedField(response, fieldNo);
+	const clientMessage = create(AgentClientMessageSchema, { message: {
+		case: "interactionResponse",
+		value: response
+	} });
+	h2Request.write(frameConnectMessage$1(toBinary(AgentClientMessageSchema, clientMessage)));
+	log$1("interactionResponse", "unknownApproved", {
+		id: queryId,
+		field: fieldNo
+	});
+}
+/**
+* Answer a Cursor `interaction_query` so the Run RPC can continue.
+*
+* Hosted web search / Exa / unnamed permission gates (field 9 = WebFetch on
+* current Cursor builds) block the turn until the client writes an
+* `interaction_response`. Dropping the frame leaves the HTTP/2 stream alive
+* on heartbeats that are not semantic progress; the lazy idle watchdog then
+* aborts with "Provider stream stalled while waiting for the next event".
+*
+* Unsupported interactive queries are rejected so the server is not stranded.
+* VM setup is left unanswered rather than reporting a fake success.
+*/
+function handleInteractionQuery(query, h2Request) {
+	const queryCase = query.query.case;
+	log$1("interactionQuery", queryCase, query.query.value);
+	if (!queryCase) {
+		const unknown = protoUnknownFields$1(query).find((field) => field.wireType === 2 && field.no >= 2);
+		if (unknown) {
+			log$1("warn", "unknownInteractionQueryApproved", {
+				id: query.id,
+				field: unknown.no
+			});
+			sendUnknownApprovedInteractionResponse(h2Request, query.id, unknown.no);
+			return;
+		}
+		log$1("warn", "unknownInteractionQuery", { id: query.id });
+		return;
+	}
+	switch (queryCase) {
+		case "webSearchRequestQuery":
+			sendInteractionResponse(h2Request, query.id, {
+				case: "webSearchRequestResponse",
+				value: create(WebSearchRequestResponseSchema, { result: {
+					case: "approved",
+					value: create(WebSearchRequestResponse_ApprovedSchema, {})
+				} })
+			});
+			return;
+		case "exaSearchRequestQuery":
+			sendInteractionResponse(h2Request, query.id, {
+				case: "exaSearchRequestResponse",
+				value: create(ExaSearchRequestResponseSchema, { result: {
+					case: "approved",
+					value: create(ExaSearchRequestResponse_ApprovedSchema, {})
+				} })
+			});
+			return;
+		case "exaFetchRequestQuery":
+			sendInteractionResponse(h2Request, query.id, {
+				case: "exaFetchRequestResponse",
+				value: create(ExaFetchRequestResponseSchema, { result: {
+					case: "approved",
+					value: create(ExaFetchRequestResponse_ApprovedSchema, {})
+				} })
+			});
+			return;
+		case "webFetchRequestQuery":
+			sendInteractionResponse(h2Request, query.id, {
+				case: "webFetchRequestResponse",
+				value: create(WebFetchRequestResponseSchema, { result: {
+					case: "approved",
+					value: create(WebFetchRequestResponse_ApprovedSchema, {})
+				} })
+			});
+			return;
+		case "askQuestionInteractionQuery":
+			sendInteractionResponse(h2Request, query.id, {
+				case: "askQuestionInteractionResponse",
+				value: create(AskQuestionInteractionResponseSchema, { result: create(AskQuestionResultSchema, { result: {
+					case: "rejected",
+					value: create(AskQuestionRejectedSchema, { reason: `Interactive questions are ${NOT_IMPLEMENTED_SUFFIX$1}` })
+				} }) })
+			});
+			return;
+		case "switchModeRequestQuery":
+			sendInteractionResponse(h2Request, query.id, {
+				case: "switchModeRequestResponse",
+				value: create(SwitchModeRequestResponseSchema, { result: {
+					case: "rejected",
+					value: create(SwitchModeRequestResponse_RejectedSchema, { reason: `Mode switches are ${NOT_IMPLEMENTED_SUFFIX$1}` })
+				} })
+			});
+			return;
+		case "createPlanRequestQuery":
+			sendInteractionResponse(h2Request, query.id, {
+				case: "createPlanRequestResponse",
+				value: create(CreatePlanRequestResponseSchema, { result: create(CreatePlanResultSchema, { result: {
+					case: "error",
+					value: create(CreatePlanErrorSchema, { error: `Plan files are ${NOT_IMPLEMENTED_SUFFIX$1}` })
+				} }) })
+			});
+			return;
+		case "setupVmEnvironmentArgs":
+			log$1("warn", "unhandledInteractionQuery", {
+				queryCase,
+				id: query.id
+			});
+			return;
+		default: log$1("warn", "unhandledInteractionQuery", {
+			queryCase,
+			id: query.id
+		});
+	}
 }
 const CURSOR_CLIENT_VERSION = "cli-2026.07.23-e383d2b";
 /**
@@ -2299,6 +936,8 @@ const CURSOR_PROXY_TUNNEL_TIMEOUT_MS = 3e4;
 const NOT_IMPLEMENTED_SUFFIX = "not implemented by this client";
 /** Bare gRPC `resource_exhausted` end-streams (also inside a Connect error message). */
 const RESOURCE_EXHAUSTED_PATTERN = /resource.?exhausted/i;
+/** Model-resolution failures that can safely retry the exact discovery id before any server output. */
+const CURSOR_MODEL_NOT_FOUND_PATTERN = /^(?:Connect error not_found:|gRPC error 5:)/i;
 const NOT_IMPLEMENTED = `Not implemented by this client`;
 const conversationStateCache = /* @__PURE__ */ new Map();
 const conversationBlobStores = /* @__PURE__ */ new Map();
@@ -2306,13 +945,15 @@ const warnedCursorKimiK3ReplayMessages = /* @__PURE__ */ new Set();
 /**
 * Base conversation id → rotated wire id (#8345). Cursor's backend can pin a
 * per-conversation rejection (bare `resource_exhausted`, zero tokens) to one
-* conversationId forever; the session is then unusable until /fork mints a
-* new id. On the first such failure the id is rotated once and the cached
-* state migrates, so the retry loop's next attempt starts a fresh
-* conversation — the same recovery /fork performs. Keyed by the base id the
-* caller derived, so a failed rotation is never repeated.
+* conversationId forever. On such a failure the id is rotated and the next
+* attempt rebuilds a fresh conversation from `context` (no cached-state
+* migration). A failed rotation is not repeated, so real account exhaustion
+* is not hidden. After the rotated id completes a turn, a later poison of
+* that id is allowed to rotate again.
 */
 const rotatedConversationIds = /* @__PURE__ */ new Map();
+const successfulRotatedConversationIds = /* @__PURE__ */ new Set();
+const freshRotatedConversationIds = /* @__PURE__ */ new Set();
 const CONNECT_END_STREAM_FLAG = 2;
 async function appendCursorDebugLog(entry) {
 	const logPath = $env.DEBUG_CURSOR_LOG;
@@ -2341,14 +982,17 @@ function frameConnectMessage(data, flags = 0) {
 	frame.set(data, 5);
 	return frame;
 }
+var ConnectEndStreamError = class extends ProviderResponseError {
+	diagnosticMessage;
+	constructor(classificationMessage, diagnosticMessage) {
+		super(classificationMessage, { kind: "envelope" });
+		this.diagnosticMessage = diagnosticMessage;
+	}
+};
 function parseConnectEndStream(data) {
 	try {
 		const error = JSON.parse(new TextDecoder().decode(data))?.error;
-		if (error) {
-			const code = typeof error.code === "string" ? error.code : "unknown";
-			const message = typeof error.message === "string" ? error.message : "Unknown error";
-			return new ProviderResponseError(`Connect error ${code}: ${message}`, { kind: "envelope" });
-		}
+		if (error) return new ConnectEndStreamError(`Connect error ${typeof error.code === "string" ? error.code : "unknown"}: ${typeof error.message === "string" ? error.message : "Unknown error"}`, formatConnectEndStreamError(error));
 		return null;
 	} catch {
 		return new ProviderResponseError("Failed to parse Connect end stream", { kind: "envelope" });
@@ -2456,10 +1100,10 @@ function omitTypeName(record) {
 	const { $typeName: _, ...rest } = record;
 	return rest;
 }
-const streamCursor = (model, context, options) => {
+function streamCursorWithWireMode(model, context, options, wireMode, timing) {
 	const stream = new AssistantMessageEventStream();
 	(async () => {
-		const startTime = performance.now();
+		const startTime = timing?.startTime ?? performance.now();
 		let firstTokenTime;
 		const output = {
 			role: "assistant",
@@ -2482,7 +1126,7 @@ const streamCursor = (model, context, options) => {
 				}
 			},
 			stopReason: "stop",
-			timestamp: Date.now()
+			timestamp: timing?.timestamp ?? Date.now()
 		};
 		const inFlightDispatches = /* @__PURE__ */ new Set();
 		let abortSettled;
@@ -2490,7 +1134,7 @@ const streamCursor = (model, context, options) => {
 			const signal = options?.signal;
 			while (inFlightDispatches.size > 0) {
 				if (signal?.aborted) return;
-				const settled = Promise.all([...inFlightDispatches]);
+				const settled = Promise.all(inFlightDispatches);
 				if (!signal) {
 					await settled;
 					continue;
@@ -2507,6 +1151,7 @@ const streamCursor = (model, context, options) => {
 		let h2Settled = false;
 		let sawTurnEnded = false;
 		let endStreamError = null;
+		let sawProgressOrSideEffect = false;
 		let openBlockState;
 		const settleH2 = (error) => {
 			if (h2Settled) return;
@@ -2528,21 +1173,27 @@ const streamCursor = (model, context, options) => {
 		let baseConversationId;
 		let conversationId;
 		let usageState;
+		let serializedFallbackWireModelId;
 		try {
 			const apiKey = options?.apiKey;
 			if (!apiKey) throw new MissingApiKeyError(void 0, "Cursor API key (access token) is required");
 			baseConversationId = options?.conversationId ?? options?.sessionId ?? crypto.randomUUID();
 			conversationId = rotatedConversationIds.get(baseConversationId) ?? baseConversationId;
+			const rotatedFresh = freshRotatedConversationIds.has(conversationId);
 			const blobStore = conversationBlobStores.get(conversationId) ?? /* @__PURE__ */ new Map();
 			conversationBlobStores.set(conversationId, blobStore);
-			const cachedState = conversationStateCache.get(conversationId);
-			const { requestBytes, conversationState } = buildGrpcRequest(model, context, options, {
+			const cachedState = rotatedFresh ? void 0 : conversationStateCache.get(conversationId);
+			const builtRequest = await buildGrpcRequestForWireMode(model, context, options, {
 				conversationId,
 				blobStore,
-				conversationState: cachedState
-			});
+				conversationState: cachedState,
+				rotatedFresh
+			}, wireMode);
+			const { requestBytes, conversationState } = builtRequest;
+			serializedFallbackWireModelId = builtRequest.fallbackWireModelId;
 			conversationStateCache.set(conversationId, conversationState);
-			const requestContextTools = buildMcpToolDefinitions(context.tools);
+			const requestContextTools = buildMcpToolDefinitions(context.tools, model.requiresCursorToolSchemaProjection === true);
+			const requestContextRules = buildCursorRequestContextRules(context.systemPrompt);
 			const baseUrl = model.baseUrl || "https://api2.cursor.sh";
 			const requestPath = "/agent.v1.AgentService/Run";
 			const requestHeaders = {
@@ -2565,7 +1216,7 @@ const streamCursor = (model, context, options) => {
 				headers: requestHeaders,
 				bodyBase64: Buffer.from(requestBytes).toString("base64")
 			}) : void 0;
-			const proxyUrl = shouldBypassProxy(new URL(baseUrl)) ? void 0 : getProxyForProvider(model.provider);
+			const proxyUrl = getProxyForUrl(model.provider, new URL(baseUrl));
 			if (proxyUrl) {
 				const tlsSocket = await connectProxiedSocket(proxyUrl, baseUrl, {
 					signal: options?.signal,
@@ -2643,8 +1294,10 @@ const streamCursor = (model, context, options) => {
 					}
 					try {
 						const serverMessage = fromBinary(AgentServerMessageSchema, messageBytes);
-						const isTurnEnded = serverMessage.message.case === "interactionUpdate" && serverMessage.message.value.message?.case === "turnEnded";
-						const dispatch = handleServerMessage(serverMessage, output, stream, state, blobStore, h2Request, options?.execHandlers, options?.onToolResult, usageState, requestContextTools, onConversationCheckpoint).catch((error) => {
+						const interactionCase = (serverMessage.message.case === "interactionUpdate" ? serverMessage.message.value : void 0)?.message?.case;
+						if (interactionCase !== "heartbeat") sawProgressOrSideEffect = true;
+						const isTurnEnded = interactionCase === "turnEnded";
+						const dispatch = handleServerMessage(serverMessage, output, stream, state, blobStore, h2Request, options?.execHandlers, options?.onToolResult, usageState, requestContextTools, requestContextRules, onConversationCheckpoint, options?.externalToolExecutor).catch((error) => {
 							log("error", "handleServerMessage", { error: String(error) });
 						});
 						inFlightDispatches.add(dispatch);
@@ -2688,11 +1341,15 @@ const streamCursor = (model, context, options) => {
 			h2Request.write(frameConnectMessage(requestBytes));
 			heartbeatTimer = setInterval(sendHeartbeat, 5e3);
 			await h2Completion.promise;
+			if (conversationId && baseConversationId && conversationId !== baseConversationId) {
+				successfulRotatedConversationIds.add(conversationId);
+				freshRotatedConversationIds.delete(conversationId);
+			}
 			await drainInFlightDispatches();
 			endCurrentTextBlock(output, stream, state);
 			endCurrentThinkingBlock(output, stream, state);
 			flushOpenToolCalls(output, stream, state);
-			calculateCost(model, output.usage);
+			calculateCost(model, output.usage, output.timestamp);
 			output.duration = performance.now() - startTime;
 			if (firstTokenTime) output.ttft = firstTokenTime - startTime;
 			stream.push({
@@ -2702,6 +1359,30 @@ const streamCursor = (model, context, options) => {
 			});
 			stream.end();
 		} catch (error) {
+			if ((wireMode === "normalized" && !sawProgressOrSideEffect && !options?.signal?.aborted && error instanceof Error && CURSOR_MODEL_NOT_FOUND_PATTERN.test(error.message) ? serializedFallbackWireModelId : void 0) !== void 0) {
+				if (heartbeatTimer) {
+					clearInterval(heartbeatTimer);
+					heartbeatTimer = null;
+				}
+				h2Request?.close();
+				h2Client?.close();
+				const fallbackStream = streamCursorWithWireMode(model, context, options, "discovered", {
+					startTime,
+					timestamp: output.timestamp
+				});
+				stream.forwardLocalWorkFrom(fallbackStream);
+				try {
+					for await (const event of fallbackStream) {
+						if (event.type === "start") continue;
+						stream.push(event);
+					}
+					const fallbackResult = await fallbackStream.result();
+					if (!stream.resultSettled) stream.end(fallbackResult);
+				} finally {
+					stream.forwardLocalWorkFrom(void 0);
+				}
+				return;
+			}
 			await drainInFlightDispatches();
 			if (openBlockState) {
 				endCurrentTextBlock(output, stream, openBlockState);
@@ -2712,18 +1393,26 @@ const streamCursor = (model, context, options) => {
 				api: model.api,
 				signal: options?.signal
 			});
-			if (conversationId !== void 0 && baseConversationId !== void 0 && usageState !== void 0 && !usageState.sawTokenDelta && RESOURCE_EXHAUSTED_PATTERN.test(result.message) && !rotatedConversationIds.has(baseConversationId)) {
+			const currentRotated = baseConversationId === void 0 ? void 0 : rotatedConversationIds.get(baseConversationId);
+			const canRotate = currentRotated === void 0 || successfulRotatedConversationIds.has(currentRotated);
+			if (conversationId !== void 0 && baseConversationId !== void 0 && usageState !== void 0 && !usageState.sawTokenDelta && RESOURCE_EXHAUSTED_PATTERN.test(result.message) && canRotate) {
 				const rotated = crypto.randomUUID();
+				if (currentRotated) successfulRotatedConversationIds.delete(currentRotated);
 				rotatedConversationIds.set(baseConversationId, rotated);
-				const state = conversationStateCache.get(conversationId);
-				if (state) conversationStateCache.set(rotated, state);
-				const blobs = conversationBlobStores.get(conversationId);
-				if (blobs) conversationBlobStores.set(rotated, blobs);
+				freshRotatedConversationIds.add(rotated);
+				debug("cursor conversation rotated", {
+					base: baseConversationId,
+					from: conversationId,
+					to: rotated
+				});
 			}
 			output.stopReason = result.stopReason;
 			output.errorStatus = result.status;
 			output.errorId = result.id;
-			output.errorMessage = result.message;
+			if (error instanceof ConnectEndStreamError) {
+				output.errorClassificationMessage = result.message;
+				output.errorMessage = error.diagnosticMessage;
+			} else output.errorMessage = result.message;
 			output.duration = performance.now() - startTime;
 			if (firstTokenTime) output.ttft = firstTokenTime - startTime;
 			stream.push({
@@ -2743,19 +1432,57 @@ const streamCursor = (model, context, options) => {
 		}
 	})();
 	return stream;
-};
+}
+/** Streams a Cursor Agent turn, retrying a discovered effort id when its normalized wire id is unavailable. */
+const streamCursor = (model, context, options) => streamCursorWithWireMode(model, context, options, "normalized");
 function markCursorExecResolved(block) {
 	block[kCursorExecResolved] = true;
 }
 /** Exported for tests: drives one Cursor server message through the stream (exec waits mark the stream busy). */
-async function handleServerMessage(msg, output, stream, state, blobStore, h2Request, execHandlers, onToolResult, usageState, requestContextTools, onConversationCheckpoint) {
+async function handleServerMessage(msg, output, stream, state, blobStore, h2Request, execHandlers, onToolResult, usageState, requestContextTools, requestContextRules = [], onConversationCheckpoint, externalToolExecutor = false) {
 	const msgCase = msg.message.case;
 	log("serverMessage", msgCase, msg.message.value);
 	if (msgCase === "interactionUpdate") processInteractionUpdate(msg.message.value, output, stream, state, usageState);
 	else if (msgCase === "kvServerMessage") handleKvServerMessage(msg.message.value, blobStore, h2Request);
-	else if (msgCase === "execServerMessage") await stream.trackLocalWork(handleExecServerMessage(msg.message.value, h2Request, execHandlers, onToolResult, requestContextTools, output, stream, state));
+	else if (msgCase === "execServerMessage") await stream.trackLocalWork(handleExecServerMessage(msg.message.value, h2Request, execHandlers, onToolResult, requestContextTools, requestContextRules, output, stream, state, externalToolExecutor));
+	else if (msgCase === "interactionQuery") handleInteractionQuery(msg.message.value, h2Request);
 	else if (msgCase === "conversationCheckpointUpdate") handleConversationCheckpointUpdate(msg.message.value, output, usageState, onConversationCheckpoint);
 }
+function selectHostedFetchCall(toolCall) {
+	const oneof = toolCall?.tool;
+	if (oneof?.case === "fetchToolCall" || oneof?.case === "webFetchToolCall") return oneof.value;
+}
+function hostedFetchUnknown(toolCall) {
+	if (!toolCall) return false;
+	return protoUnknownFields(toolCall).some((field) => field.no === 37) || protoUnknownFields(toolCall.tool ?? {}).some((field) => field.no === 37);
+}
+function extractHttpUrlFromUnknown(message) {
+	for (const field of protoUnknownFields(message)) {
+		const match = new TextDecoder().decode(field.data).match(/https?:\/\/[^\x00-\x1f]+/);
+		if (match) return match[0];
+	}
+	const nested = message.tool;
+	return nested ? extractHttpUrlFromUnknown(nested) : void 0;
+}
+function describeHostedFetchResult(call) {
+	const result = call?.result?.result;
+	if (result?.case === "success") return {
+		text: result.value?.content || result.value?.url || "Fetched",
+		isError: false
+	};
+	if (result?.case === "error") return {
+		text: result.value?.error || "Fetch failed",
+		isError: true
+	};
+	return {
+		text: "Fetch completed",
+		isError: false
+	};
+}
+function protoUnknownFields(message) {
+	const raw = message.$unknown;
+	return Array.isArray(raw) ? raw : [];
+}
 function handleKvServerMessage(kvMsg, blobStore, h2Request) {
 	const kvCase = kvMsg.message.case;
 	if (kvCase === "getBlobArgs") {
@@ -3019,7 +1746,7 @@ function sendShellStreamExitFromResult(h2Request, execMsg, execResult, sendBuffe
 		default: return;
 	}
 }
-async function handleExecServerMessage(execMsg, h2Request, execHandlers, onToolResult, requestContextTools, output, stream, state) {
+async function handleExecServerMessage(execMsg, h2Request, execHandlers, onToolResult, requestContextTools, requestContextRules, output, stream, state, externalToolExecutor) {
 	const execCase = execMsg.message.case;
 	log("exec", "dispatch", {
 		execCase,
@@ -3028,7 +1755,7 @@ async function handleExecServerMessage(execMsg, h2Request, execHandlers, onToolR
 	});
 	if (execCase === "requestContextArgs") {
 		const requestContext = create(RequestContextSchema, {
-			rules: [],
+			rules: requestContextRules,
 			repositoryInfo: [],
 			tools: requestContextTools,
 			gitRepos: [],
@@ -3056,8 +1783,16 @@ async function handleExecServerMessage(execMsg, h2Request, execHandlers, onToolR
 		case "readArgs": {
 			const args = execMsg.message.value;
 			if (!args.toolCallId) args.toolCallId = crypto.randomUUID();
-			synthesizeCursorExecToolCall(output, stream, state, args.toolCallId, "read", { path: piReadDisplayPath(args.path, args.offset, args.limit) });
-			const { execResult } = await resolveExecHandler(args, execHandlers?.read?.bind(execHandlers), onToolResult, (toolResult) => buildReadResultFromToolResult(args.path, toolResult, args.offset !== void 0 || args.limit !== void 0 || piReadPathHasRange(args.path)), (reason) => buildReadRejectedResult(args.path, reason), (error) => buildReadErrorResult(args.path, error), {
+			const editOwned = isEditOwnedToolCallId(state, output, args.toolCallId);
+			const composed = editOwned ? cursorEditOwnedReadPath(args.path, args.offset, args.limit) : args.path;
+			const handlerArgs = editOwned ? composed === null ? args : {
+				...args,
+				path: composed,
+				offset: void 0,
+				limit: void 0
+			} : args;
+			if (!editOwned) synthesizeCursorExecToolCall(output, stream, state, args.toolCallId, "read", { path: piReadDisplayPath(args.path, args.offset, args.limit) });
+			const { execResult } = await resolveExecHandler(handlerArgs, execHandlers?.read?.bind(execHandlers), editOwned ? void 0 : onToolResult, (toolResult) => buildReadResultFromToolResult(args.path, toolResult, args.offset !== void 0 || args.limit !== void 0 || piReadPathHasRange(args.path)), (reason) => buildReadRejectedResult(args.path, reason), (error) => buildReadErrorResult(args.path, error), editOwned ? null : {
 				toolCallId: args.toolCallId,
 				toolName: "read"
 			});
@@ -3100,20 +1835,26 @@ async function handleExecServerMessage(execMsg, h2Request, execHandlers, onToolR
 		case "writeArgs": {
 			const args = execMsg.message.value;
 			if (!args.toolCallId) args.toolCallId = crypto.randomUUID();
+			const editOwned = isEditOwnedToolCallId(state, output, args.toolCallId);
 			const content = args.fileText ?? new TextDecoder().decode(args.fileBytes ?? /* @__PURE__ */ new Uint8Array());
-			synthesizeCursorExecToolCall(output, stream, state, args.toolCallId, "write", {
+			if (!editOwned) synthesizeCursorExecToolCall(output, stream, state, args.toolCallId, "write", {
 				path: args.path,
 				content
 			});
-			const { execResult } = await resolveExecHandler(args, execHandlers?.write?.bind(execHandlers), onToolResult, (toolResult) => buildWriteResultFromToolResult({
+			const write = execHandlers?.write?.bind(execHandlers);
+			const { execResult } = await resolveExecHandler(args, write ? async (writeArgs) => {
+				const result = await write(writeArgs);
+				return editOwned ? remapExecHandlerToolName(result, "edit") : result;
+			} : void 0, onToolResult, (toolResult) => buildWriteResultFromToolResult({
 				path: args.path,
 				fileText: args.fileText,
 				fileBytes: args.fileBytes,
 				returnFileContentAfterWrite: args.returnFileContentAfterWrite
 			}, toolResult), (reason) => buildWriteRejectedResult(args.path, reason), (error) => buildWriteErrorResult(args.path, error), {
 				toolCallId: args.toolCallId,
-				toolName: "write"
+				toolName: editOwned ? "edit" : "write"
 			});
+			if (editOwned) markEditToolCallPaired(state, args.toolCallId);
 			sendExecClientMessage(h2Request, execMsg, "writeResult", execResult);
 			return;
 		}
@@ -3226,7 +1967,7 @@ async function handleExecServerMessage(execMsg, h2Request, execHandlers, onToolR
 					state.resolvedMcpToolCallIds.add(mcpCall.toolCallId);
 				}
 			}
-			const { execResult } = await resolveExecHandler(mcpCall, execHandlers?.mcp?.bind(execHandlers), onToolResult, (toolResult) => buildMcpResultFromToolResult(mcpCall, toolResult), (_reason) => buildMcpToolNotFoundResult(mcpCall), (error) => buildMcpErrorResult(error), execHandlers?.mcp ? {
+			const { execResult } = await resolveExecHandler(mcpCall, execHandlers?.mcp?.bind(execHandlers), onToolResult, (toolResult) => buildMcpResultFromToolResult(mcpCall, toolResult), (_reason) => externalToolExecutor && !execHandlers?.mcp ? buildMcpExternalHandoffResult() : buildMcpToolNotFoundResult(mcpCall), (error) => buildMcpErrorResult(error), execHandlers?.mcp ? {
 				toolCallId: mcpCall.toolCallId,
 				toolName: mcpCall.toolName
 			} : null);
@@ -3717,7 +2458,7 @@ async function resolveExecHandler(args, handler, onToolResult, buildFromToolResu
 }
 /**
 * Derive the transcript state of an exec result the SDK handler returned in the
-* TResult-only form, which carries no `toolResult` to copy it from.
+* R-only form, which carries no `toolResult` to copy it from.
 *
 * Every exec result in `agent.proto` is a `oneof result` whose success variant
 * is named `success` — the rest (`error`, `rejected`, `file_not_found`,
@@ -4203,9 +2944,11 @@ function parseToolArgsJson(text) {
 }
 function decodeMcpArgValue(value) {
 	try {
-		const parsedValue = fromBinary(ValueSchema, value);
-		const jsonValue = toJson(ValueSchema, parsedValue);
-		if (typeof jsonValue === "string") return parseToolArgsJson(jsonValue);
+		const jsonValue = decodeJsonValue(value);
+		if (typeof jsonValue === "string") {
+			const first = jsonValue.trimStart()[0];
+			return first === "{" || first === "[" || first === "\"" ? parseToolArgsJson(jsonValue) : jsonValue;
+		}
 		return jsonValue;
 	} catch {}
 	return parseToolArgsJson(new TextDecoder().decode(value));
@@ -4271,6 +3014,141 @@ function selectMcpCall(toolCall) {
 	return toolCall?.mcpToolCall;
 }
 /**
+* Same oneof-first selector as MCP: a wire-decoded `ToolCall` exposes
+* `editToolCall` only as `{ case: "editToolCall", value }`.
+*/
+function selectEditCall(toolCall) {
+	const oneof = toolCall?.tool;
+	if (oneof?.case === "editToolCall") return oneof.value;
+	return toolCall?.editToolCall;
+}
+function selectEditStreamDelta(update) {
+	const oneof = update.toolCallDelta?.delta;
+	if (oneof?.case === "editToolCallDelta") return oneof.value?.streamContentDelta;
+	return update.toolCallDelta?.editToolCallDelta?.streamContentDelta;
+}
+function rememberEditOwnedToolCall(state, toolCall, envelopeId) {
+	if (!state.editOwnedToolCallIds) state.editOwnedToolCallIds = /* @__PURE__ */ new Set();
+	const ids = state.editOwnedToolCallIds;
+	if (envelopeId) ids.add(envelopeId);
+	if (toolCall?.toolCallId) ids.add(toolCall.toolCallId);
+}
+function isEditOwnedToolCallId(state, output, toolCallId) {
+	if (state.editOwnedToolCallIds?.has(toolCallId)) return true;
+	return output.content.some((block) => block.type === "toolCall" && block.id === toolCallId && block.name === "edit");
+}
+function stringToolArg(args, key) {
+	const value = args?.[key];
+	return typeof value === "string" ? value : void 0;
+}
+function markEditToolCallPaired(state, toolCallId) {
+	if (!state.pairedEditToolCallIds) state.pairedEditToolCallIds = /* @__PURE__ */ new Set();
+	state.pairedEditToolCallIds.add(toolCallId);
+}
+/**
+* `EditToolCall.result` is an `EditResult` message whose own oneof is also
+* named `result`. The discriminator is `result.result.case`, same nesting as
+* `describeConnectScmResult` / the todo extractors.
+*/
+function describeEditResult(toolCall) {
+	const oneof = selectEditCall(toolCall)?.result?.result;
+	const variant = oneof?.case;
+	const value = oneof?.value;
+	if (variant === "success") return {
+		text: value?.message || value?.path || "Edited",
+		isError: false
+	};
+	if (variant === "error") return {
+		text: value?.modelVisibleError || value?.error || "Edit failed",
+		isError: true
+	};
+	if (variant === "rejected") return {
+		text: value?.reason || "Edit rejected",
+		isError: true
+	};
+	if (variant === "fileNotFound") return {
+		text: value?.path ? `File not found: ${value.path}` : "File not found",
+		isError: true
+	};
+	if (variant === "readPermissionDenied") return {
+		text: value?.path ? `Read permission denied: ${value.path}` : "Read permission denied",
+		isError: true
+	};
+	if (variant === "writePermissionDenied") return {
+		text: value?.error || (value?.path ? `Write permission denied: ${value.path}` : "Write permission denied"),
+		isError: true
+	};
+	return {
+		text: "Edit reported no result",
+		isError: true
+	};
+}
+function remapExecHandlerToolName(result, toolName) {
+	if (isToolResultMessage(result)) return {
+		...result,
+		toolName
+	};
+	if (result && typeof result === "object" && "toolResult" in result) {
+		const record = result;
+		if (record.toolResult && record.result !== void 0) return {
+			result: record.result,
+			toolResult: {
+				...record.toolResult,
+				toolName
+			}
+		};
+		if (record.toolResult) return {
+			...record.toolResult,
+			toolName
+		};
+	}
+	return result;
+}
+/**
+* Open (or refresh) the single `edit` transcript block for a native StrReplace
+* `editToolCall`. Materialization reads/writes reuse this id and must not
+* synthesize their own blocks.
+*/
+function openOrUpdateEditBlock(output, stream, state, toolCall, envelopeId) {
+	const edit = selectEditCall(toolCall);
+	if (!edit && toolCall?.tool?.case !== "editToolCall") return void 0;
+	rememberEditOwnedToolCall(state, toolCall, envelopeId);
+	const id = toolCall?.toolCallId || envelopeId;
+	if (!id) return void 0;
+	const nextArgs = omitUndefinedArgs({
+		path: edit?.args?.path,
+		stream_content: edit?.args?.streamContent
+	});
+	const existing = output.content.find((block) => block.type === "toolCall" && block.id === id);
+	if (existing) {
+		existing.arguments = {
+			...existing.arguments,
+			...nextArgs
+		};
+		return existing;
+	}
+	endCurrentTextBlock(output, stream, state);
+	endCurrentThinkingBlock(output, stream, state);
+	const block = {
+		type: "toolCall",
+		id,
+		name: "edit",
+		arguments: nextArgs,
+		[kStreamingBlockIndex]: output.content.length,
+		[kStreamingBlockKind]: "cursor-edit",
+		[kStreamingEnvelopeId]: envelopeId || void 0,
+		[kCursorExecResolved]: true
+	};
+	output.content.push(block);
+	retainStreamedCall(state, block, envelopeId);
+	stream.push({
+		type: "toolcall_start",
+		contentIndex: output.content.length - 1,
+		partial: output
+	});
+	return block;
+}
+/**
 * The streamed `ToolCall` variants whose block the exec channel owns.
 *
 * Each of these is announced on the interaction stream AND dispatched as its
@@ -4348,17 +3226,19 @@ function flushOpenToolCalls(output, stream, state) {
 			clearStreamingPartialJson(block);
 		}
 		const kind = block[kStreamingBlockKind];
-		if (kind === "connect-scm" || kind === "todo") state.onToolResult?.({
-			role: "toolResult",
-			toolCallId: block.id,
-			toolName: block.name,
-			content: [{
-				type: "text",
-				text: "The connection to Cursor closed before this call completed."
-			}],
-			isError: true,
-			timestamp: Date.now()
-		});
+		if (kind === "connect-scm" || kind === "todo" || kind === "cursor-edit") {
+			if (!(kind === "cursor-edit" && state.pairedEditToolCallIds?.has(block.id))) state.onToolResult?.({
+				role: "toolResult",
+				toolCallId: block.id,
+				toolName: block.name,
+				content: [{
+					type: "text",
+					text: "The connection to Cursor closed before this call completed."
+				}],
+				isError: true,
+				timestamp: Date.now()
+			});
+		}
 		stream.push({
 			type: "toolcall_end",
 			contentIndex: idx,
@@ -4579,6 +3459,19 @@ function buildMcpResultFromToolResult(_mcpCall, toolResult) {
 		})
 	} });
 }
+const MCP_EXTERNAL_HANDOFF_MESSAGE = cursor_external_tool_handoff_default.trim();
+function buildMcpExternalHandoffResult() {
+	return create(McpResultSchema, { result: {
+		case: "success",
+		value: create(McpSuccessSchema, {
+			content: [create(McpToolResultContentItemSchema, { content: {
+				case: "text",
+				value: create(McpTextContentSchema, { text: MCP_EXTERNAL_HANDOFF_MESSAGE })
+			} })],
+			isError: false
+		})
+	} });
+}
 function buildMcpToolNotFoundResult(mcpCall) {
 	return create(McpResultSchema, { result: {
 		case: "toolNotFound",
@@ -4611,7 +3504,7 @@ function buildMcpErrorResult(error) {
 * - otherwise               → completion wins.
 */
 function mergeCursorMcpToolCallArgs(streamed, completion) {
-	const merged = { ...streamed ?? {} };
+	const merged = { ...streamed };
 	if (!completion) return merged;
 	for (const [key, completionValue] of Object.entries(completion)) {
 		const streamedValue = merged[key];
@@ -4819,9 +3712,8 @@ function processInteractionUpdate(update, output, stream, state, usageState) {
 					type: "toolCall",
 					id,
 					name: args.toolName || args.name || "",
-					arguments: {},
+					arguments: decodeMcpArgsMap(args.args) ?? {},
 					[kStreamingBlockIndex]: output.content.length,
-					[kStreamingPartialJson]: "",
 					[kStreamingBlockKind]: "mcp",
 					[kStreamingEnvelopeId]: update.message.value.callId || void 0
 				};
@@ -4854,10 +3746,55 @@ function processInteractionUpdate(update, output, stream, state, usageState) {
 					contentIndex: output.content.length - 1,
 					partial: output
 				});
+				return;
+			}
+			const fetchCall = selectHostedFetchCall(toolCall);
+			if (fetchCall || hostedFetchUnknown(toolCall)) {
+				const url = fetchCall?.args?.url || extractHttpUrlFromUnknown(toolCall);
+				const block = {
+					type: "toolCall",
+					id: fetchCall?.args?.toolCallId || update.message.value.callId || crypto.randomUUID(),
+					name: "web_fetch",
+					arguments: url ? { url } : {},
+					[kStreamingBlockIndex]: output.content.length,
+					[kStreamingBlockKind]: "web-fetch",
+					[kStreamingEnvelopeId]: update.message.value.callId || void 0,
+					[kCursorExecResolved]: true
+				};
+				output.content.push(block);
+				retainStreamedCall(state, block, update.message.value.callId);
+				stream.push({
+					type: "toolcall_start",
+					contentIndex: output.content.length - 1,
+					partial: output
+				});
+				return;
 			}
+			openOrUpdateEditBlock(output, stream, state, toolCall, update.message.value.callId);
 		}
 	} else if (updateCase === "toolCallDelta" || updateCase === "partialToolCall") {
-		const target = resolveStreamedCall(state, update.message.value.callId);
+		const value = update.message.value;
+		if (updateCase === "partialToolCall" && value.toolCall) openOrUpdateEditBlock(output, stream, state, value.toolCall, value.callId);
+		const editDelta = selectEditStreamDelta(value);
+		if (editDelta) {
+			const target = resolveStreamedCall(state, value.callId);
+			if (target?.[kStreamingBlockKind] === "cursor-edit") {
+				const current = stringToolArg(target.arguments, "stream_content") ?? "";
+				target.arguments = {
+					...target.arguments,
+					stream_content: current + editDelta
+				};
+				const idx = output.content.indexOf(target);
+				stream.push({
+					type: "toolcall_delta",
+					contentIndex: idx,
+					delta: editDelta,
+					partial: output
+				});
+				return;
+			}
+		}
+		const target = resolveStreamedCall(state, value.callId);
 		if (target?.[kStreamingBlockKind] === "mcp") {
 			const snapshot = update.message.value.argsTextDelta || "";
 			const current = target[kStreamingPartialJson] ?? "";
@@ -4884,7 +3821,7 @@ function processInteractionUpdate(update, output, stream, state, usageState) {
 			const toolCall = update.message.value.toolCall;
 			if (settled[kStreamingBlockKind] === "mcp") {
 				const partial = settled[kStreamingPartialJson];
-				if (partial !== void 0) settled.arguments = parseStreamingJson(partial);
+				if (partial) settled.arguments = parseStreamingJson(partial);
 				const decodedArgs = decodeMcpArgsMap(selectMcpCall(toolCall)?.args?.args);
 				settled.arguments = mergeCursorMcpToolCallArgs(settled.arguments, decodedArgs);
 			} else if (settled[kStreamingBlockKind] === "connect-scm") {
@@ -4906,6 +3843,22 @@ function processInteractionUpdate(update, output, stream, state, usageState) {
 					isError,
 					timestamp: Date.now()
 				});
+			} else if (settled[kStreamingBlockKind] === "web-fetch") {
+				const fetchCall = selectHostedFetchCall(toolCall);
+				const url = fetchCall?.args?.url || extractHttpUrlFromUnknown(toolCall ?? {});
+				if (url) settled.arguments = { url };
+				const { text, isError } = describeHostedFetchResult(fetchCall);
+				state.onToolResult?.({
+					role: "toolResult",
+					toolCallId: settled.id,
+					toolName: "web_fetch",
+					content: [{
+						type: "text",
+						text
+					}],
+					isError,
+					timestamp: Date.now()
+				});
 			} else if (settled[kStreamingBlockKind] === "todo") {
 				const snapshot = toolCall ? extractTodoSnapshot(toolCall) : null;
 				const error = toolCall ? extractTodoError(toolCall) : null;
@@ -4922,6 +3875,27 @@ function processInteractionUpdate(update, output, stream, state, usageState) {
 					log("error", "onTodoSnapshot", { error: hostError });
 				}
 				state.onToolResult?.(persisted ?? buildTodoToolResult(settled.id, snapshot, hostError ?? error));
+			} else if (settled[kStreamingBlockKind] === "cursor-edit") {
+				const edit = selectEditCall(toolCall);
+				if (edit?.args) settled.arguments = omitUndefinedArgs({
+					...settled.arguments,
+					path: edit.args.path ?? stringToolArg(settled.arguments, "path"),
+					stream_content: edit.args.streamContent ?? stringToolArg(settled.arguments, "stream_content")
+				});
+				if (!state.pairedEditToolCallIds?.has(settled.id)) {
+					const { text, isError } = describeEditResult(toolCall);
+					state.onToolResult?.({
+						role: "toolResult",
+						toolCallId: settled.id,
+						toolName: "edit",
+						content: [{
+							type: "text",
+							text
+						}],
+						isError,
+						timestamp: Date.now()
+					});
+				}
 			}
 			const idx = output.content.indexOf(settled);
 			clearStreamingPartialJson(settled);
@@ -4935,7 +3909,7 @@ function processInteractionUpdate(update, output, stream, state, usageState) {
 		}
 	} else if (updateCase === "turnEnded") {
 		output.stopReason = "stop";
-		if (isKimiK3ModelId(output.model) && !output.content.some((item) => item.type === "thinking" && item.thinking.length > 0)) warn("Cursor kimi-k3 turn completed without thinking blocks; persisted history will replay this turn without reasoning", {
+		if (classifyModel("cursor", output.model).family === "k3" && !output.content.some((item) => item.type === "thinking" && item.thinking.length > 0)) warn("Cursor kimi-k3 turn completed without thinking blocks; persisted history will replay this turn without reasoning", {
 			model: output.model,
 			messageTimestamp: output.timestamp
 		});
@@ -4962,6 +3936,23 @@ function storeCursorBlob(blobStore, data) {
 	return blobId;
 }
 /**
+* Cursor AgentService reconstructs the model prompt from `requestContext.rules`,
+* not from the client-supplied `rootPromptMessagesJson` system blobs. Map each
+* OMP system-prompt entry to a global CursorRule so always-apply rules survive
+* that reconstruction.
+*/
+function buildCursorRequestContextRules(systemPrompt) {
+	return normalizeSystemPrompts(systemPrompt).map((content, index) => create(CursorRuleSchema, {
+		fullPath: `/omp/system-prompt/${index}.mdc`,
+		content,
+		source: 2,
+		type: create(CursorRuleTypeSchema, { type: {
+			case: "global",
+			value: create(CursorRuleTypeGlobalSchema, {})
+		} })
+	}));
+}
+/**
 * Local tools Cursor already drives natively over the exec channel, so
 * advertising them again as MCP tools would give the model two ways to call the
 * same thing.
@@ -4981,18 +3972,28 @@ const CURSOR_NATIVE_TOOL_NAMES = /* @__PURE__ */ new Set([
 	"grep",
 	"todo"
 ]);
-function buildMcpToolDefinitions(tools) {
+function isJsonValue(value) {
+	if (value === null || typeof value === "string" || typeof value === "boolean") return true;
+	if (typeof value === "number") return Number.isFinite(value);
+	if (Array.isArray(value)) return value.every(isJsonValue);
+	if (!isRecord$1(value)) return false;
+	for (const key in value) if (!isJsonValue(value[key])) return false;
+	return true;
+}
+function buildMcpToolDefinitions(tools, requiresCursorToolSchemaProjection = false) {
 	if (!tools || tools.length === 0) return [];
 	const advertisedTools = tools.filter((tool) => !CURSOR_NATIVE_TOOL_NAMES.has(tool.name));
 	if (advertisedTools.length === 0) return [];
 	const writeTool = tools.find((tool) => tool.name === "write");
 	return (writeTool ? [...advertisedTools, writeTool] : advertisedTools).map((tool) => {
-		const jsonSchema = toolWireSchema(tool);
-		const inputSchema = toBinary(ValueSchema, fromJson(ValueSchema, jsonSchema && typeof jsonSchema === "object" ? jsonSchema : {
+		const wireSchema = toolWireSchema(tool);
+		const jsonSchema = requiresCursorToolSchemaProjection ? sanitizeSchemaForCursor(wireSchema) : wireSchema;
+		const schemaValue = jsonSchema !== null && !Array.isArray(jsonSchema) && isJsonValue(jsonSchema) ? jsonSchema : {
 			type: "object",
 			properties: {},
 			required: []
-		}));
+		};
+		const inputSchema = encodeJsonValue(schemaValue);
 		return create(McpToolDefinitionSchema, {
 			name: tool.name,
 			description: tool.description || "",
@@ -5050,7 +4051,7 @@ function cursorUserContentKey(content) {
 	return hash.digest("hex");
 }
 function canReplayCursorThinking(msg, targetModelId) {
-	return targetModelId !== void 0 && isKimiK3ModelId(targetModelId) && msg.api === "cursor-agent" && msg.provider === "cursor" && msg.model === targetModelId;
+	return targetModelId !== void 0 && classifyModel("cursor", targetModelId).family === "k3" && msg.api === "cursor-agent" && msg.provider === "cursor" && msg.model === targetModelId;
 }
 function buildCursorAssistantContent(msg, targetModelId) {
 	const content = [];
@@ -5069,14 +4070,14 @@ function buildCursorAssistantContent(msg, targetModelId) {
 		});
 	} else if (item.type === "toolCall") content.push({
 		type: "tool-call",
-		toolCallId: item.id,
+		toolCallId: normalizeToolCallId(item.id),
 		toolName: item.name,
-		args: item.arguments
+		args: normalizeCursorMcpArguments(item.arguments)
 	});
 	return content;
 }
 function assertCursorKimiK3HistoryReplayable(messages, activeUserMessageIndex, targetModelId) {
-	if (!targetModelId || !isKimiK3ModelId(targetModelId)) return;
+	if (!targetModelId || classifyModel("cursor", targetModelId).family !== "k3") return;
 	const historyEnd = activeUserMessageIndex >= 0 ? activeUserMessageIndex : messages.length;
 	const missingThinkingTurns = [];
 	const newlyWarnedKeys = [];
@@ -5142,8 +4143,27 @@ function buildCursorSystemPromptJsons(systemPrompt) {
 		content
 	}));
 }
+function collectCursorToolHistory(messages, historyEnd) {
+	const toolResults = /* @__PURE__ */ new Map();
+	const pairedToolCallIds = /* @__PURE__ */ new Set();
+	for (let index = 0; index < historyEnd; index++) {
+		const message = messages[index];
+		if (message.role === "toolResult") toolResults.set(message.toolCallId, message);
+		else if (message.role === "assistant") {
+			for (const item of message.content) if (item.type === "toolCall") pairedToolCallIds.add(item.id);
+		}
+	}
+	return {
+		toolResults,
+		pairedToolCallIds
+	};
+}
+function cursorOrphanToolResultText(result) {
+	return `${result.isError ? "[Tool Error]" : "[Tool Result]"}\n${toolResultToText(result) || "(empty result)"}`;
+}
 function buildRootPromptMessagesJson(messages, systemPromptIds, blobStore, activeUserMessageIndex = findLastUserMessageIndex(messages), targetModelId) {
 	assertCursorKimiK3HistoryReplayable(messages, activeUserMessageIndex, targetModelId);
+	const { pairedToolCallIds } = collectCursorToolHistory(messages, activeUserMessageIndex >= 0 ? activeUserMessageIndex : messages.length);
 	const entries = [...systemPromptIds];
 	const pushJson = (obj) => {
 		const bytes = new TextEncoder().encode(JSON.stringify(obj));
@@ -5166,41 +4186,67 @@ function buildRootPromptMessagesJson(messages, systemPromptIds, blobStore, activ
 				role: "assistant",
 				content
 			});
-		} else if (msg.role === "toolResult") pushJson({
-			role: "tool",
-			id: msg.toolCallId,
-			content: [{
-				type: "tool-result",
-				toolName: msg.toolName,
-				toolCallId: msg.toolCallId,
-				result: toolResultToText(msg),
-				...msg.isError ? { isError: true } : {}
-			}]
-		});
+		} else if (msg.role === "toolResult") {
+			if (!pairedToolCallIds.has(msg.toolCallId)) {
+				pushJson({
+					role: "assistant",
+					content: [{
+						type: "text",
+						text: cursorOrphanToolResultText(msg)
+					}]
+				});
+				continue;
+			}
+			const toolCallId = normalizeToolCallId(msg.toolCallId);
+			pushJson({
+				role: "tool",
+				id: toolCallId,
+				content: [{
+					type: "tool-result",
+					toolName: msg.toolName,
+					toolCallId,
+					result: toolResultToText(msg),
+					...msg.isError ? { isError: true } : {}
+				}]
+			});
+		}
 	}
 	return entries;
 }
-function isPlainRecord(value) {
-	if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
-	const prototype = Object.getPrototypeOf(value);
-	return prototype === Object.prototype || prototype === null;
+function normalizeCursorMcpArgument(value, seen) {
+	if (value === null || typeof value === "string" || typeof value === "boolean") return value;
+	if (typeof value === "number") return Number.isFinite(value) ? value : null;
+	if (typeof value !== "object") return void 0;
+	if (seen.has(value)) return void 0;
+	seen.add(value);
+	try {
+		if (Array.isArray(value)) return value.map((item) => normalizeCursorMcpArgument(item, seen) ?? null);
+		if (!isRecord$1(value)) return void 0;
+		const normalized = Object.create(null);
+		for (const key in value) {
+			if (!Object.hasOwn(value, key)) continue;
+			const normalizedItem = normalizeCursorMcpArgument(value[key], seen);
+			if (normalizedItem !== void 0) normalized[key] = normalizedItem;
+		}
+		return normalized;
+	} finally {
+		seen.delete(value);
+	}
 }
-function isJsonValue(value) {
-	if (value === null || typeof value === "string" || typeof value === "boolean") return true;
-	if (typeof value === "number") return Number.isFinite(value);
-	if (Array.isArray(value)) return value.every(isJsonValue);
-	if (!isPlainRecord(value)) return false;
-	for (const key in value) if (!isJsonValue(value[key])) return false;
-	return true;
+function normalizeCursorMcpArguments(args) {
+	const normalized = Object.create(null);
+	const seen = /* @__PURE__ */ new Set();
+	for (const name in args) {
+		if (!Object.hasOwn(args, name)) continue;
+		const normalizedValue = normalizeCursorMcpArgument(args[name], seen);
+		if (normalizedValue !== void 0) normalized[name] = normalizedValue;
+	}
+	return normalized;
 }
 function encodeCursorMcpArguments(toolCall) {
-	const encoded = {};
-	for (const name in toolCall.arguments) {
-		const value = toolCall.arguments[name];
-		if (value === void 0) continue;
-		if (!isJsonValue(value)) throw new ValidationError(`Cursor tool argument ${toolCall.name}.${name} is not JSON-serializable`);
-		encoded[name] = toBinary(ValueSchema, fromJson(ValueSchema, value));
-	}
+	const encoded = Object.create(null);
+	const normalized = normalizeCursorMcpArguments(toolCall.arguments);
+	for (const name in normalized) encoded[name] = encodeJsonValue(normalized[name]);
 	return encoded;
 }
 function createCursorMcpResult(result) {
@@ -5223,11 +4269,12 @@ function createCursorMcpResult(result) {
 	} });
 }
 function createCursorToolCallStep(toolCall, result) {
+	const toolCallId = normalizeToolCallId(toolCall.id);
 	const mcpCall = create(McpToolCallSchema, {
 		args: create(McpArgsSchema, {
 			name: toolCall.name,
 			args: encodeCursorMcpArguments(toolCall),
-			toolCallId: toolCall.id,
+			toolCallId,
 			providerIdentifier: "pi-agent",
 			toolName: toolCall.name
 		}),
@@ -5240,7 +4287,7 @@ function createCursorToolCallStep(toolCall, result) {
 				case: "mcpToolCall",
 				value: mcpCall
 			},
-			toolCallId: toolCall.id
+			toolCallId
 		})
 	} });
 }
@@ -5254,16 +4301,7 @@ function createCursorToolCallStep(toolCall, result) {
 */
 function buildConversationTurns(messages, blobStore, activeUserMessageIndex = findLastUserMessageIndex(messages), targetModelId) {
 	const turns = [];
-	const historyEnd = activeUserMessageIndex >= 0 ? activeUserMessageIndex : messages.length;
-	const toolResults = /* @__PURE__ */ new Map();
-	const pairedToolCallIds = /* @__PURE__ */ new Set();
-	for (let index = 0; index < historyEnd; index++) {
-		const message = messages[index];
-		if (message.role === "toolResult") toolResults.set(message.toolCallId, message);
-		else if (message.role === "assistant") {
-			for (const item of message.content) if (item.type === "toolCall") pairedToolCallIds.add(item.id);
-		}
-	}
+	const { toolResults, pairedToolCallIds } = collectCursorToolHistory(messages, activeUserMessageIndex >= 0 ? activeUserMessageIndex : messages.length);
 	let i = 0;
 	while (i < messages.length) {
 		const msg = messages[i];
@@ -5302,15 +4340,11 @@ function buildConversationTurns(messages, blobStore, activeUserMessageIndex = fi
 				stepBlobIds.push(storeCursorBlob(blobStore, toBinary(ConversationStepSchema, step)));
 			}
 			else if (stepMsg.role === "toolResult" && !pairedToolCallIds.has(stepMsg.toolCallId)) {
-				const text = toolResultToText(stepMsg);
-				if (text) {
-					const prefix = stepMsg.isError ? "[Tool Error]" : "[Tool Result]";
-					const step = create(ConversationStepSchema, { message: {
-						case: "assistantMessage",
-						value: create(AssistantMessageSchema, { text: `${prefix}\n${text}` })
-					} });
-					stepBlobIds.push(storeCursorBlob(blobStore, toBinary(ConversationStepSchema, step)));
-				}
+				const step = create(ConversationStepSchema, { message: {
+					case: "assistantMessage",
+					value: create(AssistantMessageSchema, { text: cursorOrphanToolResultText(stepMsg) })
+				} });
+				stepBlobIds.push(storeCursorBlob(blobStore, toBinary(ConversationStepSchema, step)));
 			}
 			i++;
 		}
@@ -5344,12 +4378,72 @@ function extractImages(content) {
 		}
 	}));
 }
-function buildGrpcRequest(model, context, options, state) {
+/**
+* Resolve the Cursor Run wire model id and its parameter list.
+*
+* Cursor's `GetUsableModels` lists reasoning models as per-effort sibling
+* slugs (`gpt-5.4-mini-low`, `gpt-5.6-sol-high`), and OMP copies those ids 1:1.
+* The Run endpoint rejects a sibling slug as the wire `model_id` with
+* `resource_exhausted` (errorId 528384); the official `cursor-agent` splits the
+* slug into its base model id plus a `reasoning` effort parameter. Mirror that
+* for OpenAI-family ids: split the tier with the compiled catalog policy
+* (`collapseVariantId`, KDL suffix/lane rules) and emit
+* `{ id: "reasoning", value: <effort> }`. The off tier (`-none`) is a sibling
+* slug too, so it normalizes to the bare (lane-preserving) base with no
+* reasoning parameter instead of going out raw.
+*
+* Non-OpenAI ids pass through unchanged — Cursor-native ids (`composer-*`,
+* `cursor-grok-*`, `default`) carry no effort suffix, and Claude/other siblings
+* need additional parameters (`thinking`, `context`) whose per-model values are
+* not exposed by the decoded `GetUsableModels` schema, so guessing them would
+* re-trigger 528384.
+*/
+function resolveCursorWireModel(model, requestModelId, wireMode = "normalized") {
+	const wireModelId = requestModelId ?? model.requestModelId ?? model.id;
+	if (wireMode === "discovered") return {
+		modelId: wireModelId,
+		parameters: []
+	};
+	const collapsed = collapseVariantId("cursor", wireModelId);
+	const effort = collapsed.effort;
+	const base = effort !== void 0 ? collapsed.logicalId : void 0;
+	if (effort !== void 0 && base && classifyModel("cursor", base).class === "openai") {
+		if (effort === "off") return {
+			modelId: base,
+			parameters: []
+		};
+		if (THINKING_EFFORTS.includes(effort)) return {
+			modelId: base,
+			parameters: [create(RequestedModel_ModelParameterbytesSchema, {
+				id: "reasoning",
+				value: collapsed.effort
+			})]
+		};
+	}
+	if (wireModelId === "composer-2.5") return {
+		modelId: wireModelId,
+		parameters: [create(RequestedModel_ModelParameterbytesSchema, {
+			id: "fast",
+			value: "false"
+		})]
+	};
+	return {
+		modelId: wireModelId,
+		parameters: []
+	};
+}
+async function buildGrpcRequestForWireMode(model, context, options, state, wireMode) {
 	const blobStore = state.blobStore;
 	const systemPromptIds = buildCursorSystemPromptJsons(context.systemPrompt).map((json) => storeCursorBlob(blobStore, new TextEncoder().encode(json)));
-	const activeUserMessageIndex = context.messages.length - 1;
+	const lastUserMessageIndex = findLastUserMessageIndex(context.messages);
+	let activeUserMessageIndex = context.messages.length - 1;
 	const activeMessage = context.messages[activeUserMessageIndex];
-	const activeUserMessage = activeMessage?.role === "user" || activeMessage?.role === "developer" ? activeMessage : void 0;
+	let activeUserMessage = activeMessage?.role === "user" || activeMessage?.role === "developer" ? activeMessage : void 0;
+	if (state.rotatedFresh && !activeUserMessage && lastUserMessageIndex >= 0) {
+		activeUserMessageIndex = lastUserMessageIndex;
+		const lastUser = context.messages[lastUserMessageIndex];
+		if (lastUser.role === "user" || lastUser.role === "developer") activeUserMessage = lastUser;
+	}
 	let userContent;
 	let userText = "";
 	let hasUserImages = false;
@@ -5391,7 +4485,7 @@ function buildGrpcRequest(model, context, options, state) {
 		rootPromptMessagesJson,
 		turns
 	});
-	const wireModelId = model.requestModelId ?? model.id;
+	const { modelId: wireModelId, parameters: wireParameters } = resolveCursorWireModel(model, options?.wireModelId, wireMode);
 	const cursorMaxMode = model.cursorMaxMode === true;
 	const modelDetails = create(ModelDetailsSchema, {
 		modelId: wireModelId,
@@ -5401,17 +4495,25 @@ function buildGrpcRequest(model, context, options, state) {
 	});
 	const requestedModel = create(RequestedModelSchema, {
 		modelId: wireModelId,
-		maxMode: cursorMaxMode
+		maxMode: cursorMaxMode,
+		parameters: wireParameters
 	});
-	const runRequest = create(AgentRunRequestSchema, {
+	let runRequest = create(AgentRunRequestSchema, {
 		conversationState,
 		action,
 		modelDetails,
 		requestedModel,
 		conversationId: state.conversationId
 	});
-	options?.onPayload?.(runRequest, model);
 	if (options?.customSystemPrompt) runRequest.customSystemPrompt = options.customSystemPrompt;
+	const replacementRequest = await options?.onPayload?.(runRequest, model);
+	if (replacementRequest !== void 0) runRequest = replacementRequest;
+	const discoveredWireModelId = options?.wireModelId ?? model.requestModelId ?? model.id;
+	const serializedParameters = runRequest.requestedModel?.parameters;
+	const fallbackWireModelId = wireMode === "normalized" && wireParameters.length > 0 && wireModelId !== discoveredWireModelId && runRequest.requestedModel?.modelId === wireModelId && runRequest.modelDetails?.modelId === wireModelId && serializedParameters?.length === wireParameters.length && serializedParameters.every((parameter, index) => {
+		const expected = wireParameters[index];
+		return expected !== void 0 && parameter.id === expected.id && parameter.value === expected.value;
+	}) ? discoveredWireModelId : void 0;
 	const clientMessage = create(AgentClientMessageSchema, { message: {
 		case: "runRequest",
 		value: runRequest
@@ -5428,7 +4530,8 @@ function buildGrpcRequest(model, context, options, state) {
 	return {
 		requestBytes,
 		blobStore,
-		conversationState
+		conversationState,
+		fallbackWireModelId
 	};
 }
 function hasImages(content) {