@agentclientprotocol/codex-acp 1.1.0 → 1.1.1

package/dist/index.js

@@ -18274,6 +18274,48 @@ function requiredDefaultOnError(schema, fallback) {
     return external_exports.NEVER;
   });
 }
+function stringTag(value, key) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) {
+    return void 0;
+  }
+  const tag = value[key];
+  return typeof tag === "string" ? tag : void 0;
+}
+function excludeKnownTags(schema, key, knownTags) {
+  return schema.superRefine((value, context) => {
+    const tag = stringTag(value, key);
+    if (tag !== void 0 && knownTags.includes(tag)) {
+      context.addIssue({
+        code: "custom",
+        path: [key],
+        message: `${key} ${JSON.stringify(tag)} is reserved by a known variant, but the value does not match that variant's schema`
+      });
+    }
+  });
+}
+function preserveCustomPayload(schema, key, knownTags) {
+  return external_exports.unknown().transform((value, context) => {
+    const result = schema.safeParse(value);
+    if (!result.success) {
+      for (const issue2 of result.error.issues) {
+        context.addIssue({ ...issue2, input: value });
+      }
+      return external_exports.NEVER;
+    }
+    const output = result.data;
+    const tag = stringTag(value, key);
+    if (tag !== void 0 && !knownTags.includes(tag)) {
+      const raw = value;
+      for (const [property, rawValue] of Object.entries(raw)) {
+        if (property === "__proto__")
+          continue;
+        if (!Object.hasOwn(output, property))
+          output[property] = rawValue;
+      }
+    }
+    return output;
+  });
+}
 function vecSkipError(itemSchema) {
   return external_exports.array(itemSchema.catch(skippedItem)).transform((items) => items.filter((item) => item !== skippedItem));
 }
@@ -18285,18 +18327,18 @@ var zWriteTextFileRequest = object({
   sessionId: zSessionId,
   path: string2(),
   content: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zReadTextFileRequest = object({
   sessionId: zSessionId,
   path: string2(),
-  line: int().gte(0).max(4294967295, {
+  line: defaultOnError(int().gte(0).max(4294967295, {
     error: "Invalid value: Expected uint32 to be <= 4294967295"
-  }).nullish(),
-  limit: int().gte(0).max(4294967295, {
+  }).nullish(), () => void 0),
+  limit: defaultOnError(int().gte(0).max(4294967295, {
     error: "Invalid value: Expected uint32 to be <= 4294967295"
-  }).nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  }).nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zToolCallId = string2();
 var zToolKind = union([
@@ -18320,49 +18362,49 @@ var zToolCallStatus = union([
 var zRole = union([literal("assistant"), literal("user")]);
 var zAnnotations = object({
   audience: defaultOnError(vecSkipError(zRole).nullish(), () => void 0),
-  lastModified: string2().nullish(),
-  priority: number2().nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  lastModified: defaultOnError(string2().nullish(), () => void 0),
+  priority: defaultOnError(number2().nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zTextContent = object({
   annotations: defaultOnError(zAnnotations.nullish(), () => void 0),
   text: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zImageContent = object({
   annotations: defaultOnError(zAnnotations.nullish(), () => void 0),
   data: string2(),
   mimeType: string2(),
-  uri: string2().nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  uri: defaultOnError(string2().nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zAudioContent = object({
   annotations: defaultOnError(zAnnotations.nullish(), () => void 0),
   data: string2(),
   mimeType: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zResourceLink = object({
   annotations: defaultOnError(zAnnotations.nullish(), () => void 0),
-  description: string2().nullish(),
-  mimeType: string2().nullish(),
+  description: defaultOnError(string2().nullish(), () => void 0),
+  mimeType: defaultOnError(string2().nullish(), () => void 0),
   name: string2(),
-  size: number2().nullish(),
-  title: string2().nullish(),
+  size: defaultOnError(number2().nullish(), () => void 0),
+  title: defaultOnError(string2().nullish(), () => void 0),
   uri: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zTextResourceContents = object({
-  mimeType: string2().nullish(),
+  mimeType: defaultOnError(string2().nullish(), () => void 0),
   text: string2(),
   uri: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zBlobResourceContents = object({
   blob: string2(),
-  mimeType: string2().nullish(),
+  mimeType: defaultOnError(string2().nullish(), () => void 0),
   uri: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zEmbeddedResourceResource = union([
   zTextResourceContents,
@@ -18371,7 +18413,7 @@ var zEmbeddedResourceResource = union([
 var zEmbeddedResource = object({
   annotations: defaultOnError(zAnnotations.nullish(), () => void 0),
   resource: zEmbeddedResourceResource,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zContentBlock = union([
   zTextContent.and(object({
@@ -18392,18 +18434,18 @@ var zContentBlock = union([
 ]);
 var zContent = object({
   content: zContentBlock,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zDiff = object({
   path: string2(),
-  oldText: string2().nullish(),
+  oldText: defaultOnError(string2().nullish(), () => void 0),
   newText: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zTerminalId = string2();
 var zTerminal = object({
   terminalId: zTerminalId,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zToolCallContent = union([
   zContent.and(object({
@@ -18418,21 +18460,21 @@ var zToolCallContent = union([
 ]);
 var zToolCallLocation = object({
   path: string2(),
-  line: int().gte(0).max(4294967295, {
+  line: defaultOnError(int().gte(0).max(4294967295, {
     error: "Invalid value: Expected uint32 to be <= 4294967295"
-  }).nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  }).nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zToolCallUpdate = object({
   toolCallId: zToolCallId,
   kind: defaultOnError(zToolKind.nullish(), () => void 0),
   status: defaultOnError(zToolCallStatus.nullish(), () => void 0),
-  title: string2().nullish(),
+  title: defaultOnError(string2().nullish(), () => void 0),
   content: defaultOnError(vecSkipError(zToolCallContent).nullish(), () => void 0),
   locations: defaultOnError(vecSkipError(zToolCallLocation).nullish(), () => void 0),
-  rawInput: unknown().optional(),
-  rawOutput: unknown().optional(),
-  _meta: record(string2(), unknown()).nullish()
+  rawInput: defaultOnError(unknown().optional(), () => void 0),
+  rawOutput: defaultOnError(unknown().optional(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zPermissionOptionId = string2();
 var zPermissionOptionKind = union([
@@ -18445,51 +18487,51 @@ var zPermissionOption = object({
   optionId: zPermissionOptionId,
   name: string2(),
   kind: zPermissionOptionKind,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zRequestPermissionRequest = object({
   sessionId: zSessionId,
   toolCall: zToolCallUpdate,
   options: array(zPermissionOption),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zEnvVariable = object({
   name: string2(),
   value: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zCreateTerminalRequest = object({
   sessionId: zSessionId,
   command: string2(),
-  args: array(string2()).optional(),
-  env: array(zEnvVariable).optional(),
-  cwd: string2().nullish(),
-  outputByteLimit: number2().nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  args: defaultOnError(vecSkipError(string2()).optional(), () => []),
+  env: defaultOnError(vecSkipError(zEnvVariable).optional(), () => []),
+  cwd: defaultOnError(string2().nullish(), () => void 0),
+  outputByteLimit: defaultOnError(number2().nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zTerminalOutputRequest = object({
   sessionId: zSessionId,
   terminalId: zTerminalId,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zReleaseTerminalRequest = object({
   sessionId: zSessionId,
   terminalId: zTerminalId,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zWaitForTerminalExitRequest = object({
   sessionId: zSessionId,
   terminalId: zTerminalId,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zKillTerminalRequest = object({
   sessionId: zSessionId,
   terminalId: zTerminalId,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zElicitationSessionScope = object({
   sessionId: zSessionId,
-  toolCallId: zToolCallId.nullish()
+  toolCallId: defaultOnError(zToolCallId.nullish(), () => void 0)
 });
 var zElicitationRequestScope = object({
   requestId: zRequestId
@@ -18504,11 +18546,12 @@ var zStringFormat = union([
 var zEnumOption = object({
   const: string2(),
   title: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  description: defaultOnError(string2().nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zStringPropertySchema = object({
-  title: string2().nullish(),
-  description: string2().nullish(),
+  title: defaultOnError(string2().nullish(), () => void 0),
+  description: defaultOnError(string2().nullish(), () => void 0),
   minLength: int().gte(0).max(4294967295, {
     error: "Invalid value: Expected uint32 to be <= 4294967295"
   }).nullish(),
@@ -18517,57 +18560,60 @@ var zStringPropertySchema = object({
   }).nullish(),
   pattern: string2().nullish(),
   format: zStringFormat.nullish(),
-  default: string2().nullish(),
+  default: defaultOnError(string2().nullish(), () => void 0),
   enum: array(string2()).nullish(),
   oneOf: array(zEnumOption).nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNumberPropertySchema = object({
-  title: string2().nullish(),
-  description: string2().nullish(),
+  title: defaultOnError(string2().nullish(), () => void 0),
+  description: defaultOnError(string2().nullish(), () => void 0),
   minimum: number2().nullish(),
   maximum: number2().nullish(),
-  default: number2().nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  default: defaultOnError(number2().nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zIntegerPropertySchema = object({
-  title: string2().nullish(),
-  description: string2().nullish(),
+  title: defaultOnError(string2().nullish(), () => void 0),
+  description: defaultOnError(string2().nullish(), () => void 0),
   minimum: number2().nullish(),
   maximum: number2().nullish(),
-  default: number2().nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  default: defaultOnError(number2().nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zBooleanPropertySchema = object({
-  title: string2().nullish(),
-  description: string2().nullish(),
-  default: boolean2().nullish(),
-  _meta: record(string2(), unknown()).nullish()
-});
-var zElicitationStringType = literal("string");
-var zUntitledMultiSelectItems = object({
-  type: zElicitationStringType,
+  title: defaultOnError(string2().nullish(), () => void 0),
+  description: defaultOnError(string2().nullish(), () => void 0),
+  default: defaultOnError(boolean2().nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
+});
+var zStringMultiSelectItems = object({
   enum: array(string2()),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zTitledMultiSelectItems = object({
   anyOf: array(zEnumOption),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
-var zMultiSelectItems = union([
-  zUntitledMultiSelectItems,
+var zMultiSelectItems = preserveCustomPayload(union([
+  zStringMultiSelectItems.and(object({
+    type: literal("string")
+  })),
+  excludeKnownTags(object({
+    type: string2()
+  }), "type", ["string"]),
   zTitledMultiSelectItems
-]);
+]), "type", ["string"]);
 var zMultiSelectPropertySchema = object({
-  title: string2().nullish(),
-  description: string2().nullish(),
+  title: defaultOnError(string2().nullish(), () => void 0),
+  description: defaultOnError(string2().nullish(), () => void 0),
   minItems: number2().nullish(),
   maxItems: number2().nullish(),
   items: zMultiSelectItems,
-  default: array(string2()).nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  default: defaultOnError(vecSkipError(string2()).nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
-var zElicitationPropertySchema = union([
+var zElicitationPropertySchema = preserveCustomPayload(union([
   zStringPropertySchema.and(object({
     type: literal("string")
   })),
@@ -18582,15 +18628,18 @@ var zElicitationPropertySchema = union([
   })),
   zMultiSelectPropertySchema.and(object({
     type: literal("array")
-  }))
-]);
+  })),
+  excludeKnownTags(object({
+    type: string2()
+  }), "type", ["array", "boolean", "integer", "number", "string"])
+]), "type", ["array", "boolean", "integer", "number", "string"]);
 var zElicitationSchema = object({
-  type: zElicitationSchemaType.optional().default("object"),
-  title: string2().nullish(),
+  type: defaultOnError(zElicitationSchemaType.optional().default("object"), () => "object"),
+  title: defaultOnError(string2().nullish(), () => void 0),
   properties: record(string2(), zElicitationPropertySchema).optional().default({}),
   required: array(string2()).nullish(),
-  description: string2().nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  description: defaultOnError(string2().nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zElicitationFormMode = intersection(union([zElicitationSessionScope, zElicitationRequestScope]), object({
   requestedSchema: zElicitationSchema
@@ -18600,32 +18649,35 @@ var zElicitationUrlMode = intersection(union([zElicitationSessionScope, zElicita
   elicitationId: zElicitationId,
   url: url()
 }));
-var zCreateElicitationRequest = intersection(union([
+var zCreateElicitationRequest = preserveCustomPayload(intersection(union([
   zElicitationFormMode.and(object({
     mode: literal("form")
   })),
   zElicitationUrlMode.and(object({
     mode: literal("url")
-  }))
+  })),
+  excludeKnownTags(intersection(union([zElicitationSessionScope, zElicitationRequestScope]), object({
+    mode: string2()
+  })), "mode", ["form", "url"])
 ]), object({
   message: string2(),
-  _meta: record(string2(), unknown()).nullish()
-}));
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
+})), "mode", ["form", "url"]);
 var zMcpServerAcpId = string2();
 var zConnectMcpRequest = object({
-  acpId: zMcpServerAcpId,
-  _meta: record(string2(), unknown()).nullish()
+  serverId: zMcpServerAcpId,
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zMcpConnectionId = string2();
 var zMessageMcpRequest = object({
   connectionId: zMcpConnectionId,
   method: string2(),
   params: record(string2(), unknown()).nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zDisconnectMcpRequest = object({
   connectionId: zMcpConnectionId,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zExtRequest = unknown();
 var zAgentRequest = object({
@@ -18649,34 +18701,34 @@ var zAgentRequest = object({
 });
 var zProtocolVersion = int().gte(0).lte(65535);
 var zPromptCapabilities = object({
-  image: boolean2().optional().default(false),
-  audio: boolean2().optional().default(false),
-  embeddedContext: boolean2().optional().default(false),
-  _meta: record(string2(), unknown()).nullish()
+  image: defaultOnError(boolean2().optional().default(false), () => false),
+  audio: defaultOnError(boolean2().optional().default(false), () => false),
+  embeddedContext: defaultOnError(boolean2().optional().default(false), () => false),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zMcpCapabilities = object({
-  http: boolean2().optional().default(false),
-  sse: boolean2().optional().default(false),
-  acp: boolean2().optional().default(false),
-  _meta: record(string2(), unknown()).nullish()
+  http: defaultOnError(boolean2().optional().default(false), () => false),
+  sse: defaultOnError(boolean2().optional().default(false), () => false),
+  acp: defaultOnError(boolean2().optional().default(false), () => false),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSessionListCapabilities = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSessionDeleteCapabilities = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSessionAdditionalDirectoriesCapabilities = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSessionForkCapabilities = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSessionResumeCapabilities = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSessionCloseCapabilities = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSessionCapabilities = object({
   list: defaultOnError(zSessionListCapabilities.nullish(), () => void 0),
@@ -18685,20 +18737,20 @@ var zSessionCapabilities = object({
   fork: defaultOnError(zSessionForkCapabilities.nullish(), () => void 0),
   resume: defaultOnError(zSessionResumeCapabilities.nullish(), () => void 0),
   close: defaultOnError(zSessionCloseCapabilities.nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zLogoutCapabilities = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zAgentAuthCapabilities = object({
   logout: defaultOnError(zLogoutCapabilities.nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zProvidersCapabilities = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesDocumentDidOpenCapabilities = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zTextDocumentSyncKind = union([
   literal("full"),
@@ -18706,16 +18758,16 @@ var zTextDocumentSyncKind = union([
 ]);
 var zNesDocumentDidChangeCapabilities = object({
   syncKind: zTextDocumentSyncKind,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesDocumentDidCloseCapabilities = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesDocumentDidSaveCapabilities = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesDocumentDidFocusCapabilities = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesDocumentEventCapabilities = object({
   didOpen: defaultOnError(zNesDocumentDidOpenCapabilities.nullish(), () => void 0),
@@ -18723,38 +18775,38 @@ var zNesDocumentEventCapabilities = object({
   didClose: defaultOnError(zNesDocumentDidCloseCapabilities.nullish(), () => void 0),
   didSave: defaultOnError(zNesDocumentDidSaveCapabilities.nullish(), () => void 0),
   didFocus: defaultOnError(zNesDocumentDidFocusCapabilities.nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesEventCapabilities = object({
   document: defaultOnError(zNesDocumentEventCapabilities.nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesRecentFilesCapabilities = object({
-  maxCount: int().gte(0).max(4294967295, {
+  maxCount: defaultOnError(int().gte(0).max(4294967295, {
     error: "Invalid value: Expected uint32 to be <= 4294967295"
-  }).nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  }).nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesRelatedSnippetsCapabilities = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesEditHistoryCapabilities = object({
-  maxCount: int().gte(0).max(4294967295, {
+  maxCount: defaultOnError(int().gte(0).max(4294967295, {
     error: "Invalid value: Expected uint32 to be <= 4294967295"
-  }).nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  }).nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesUserActionsCapabilities = object({
-  maxCount: int().gte(0).max(4294967295, {
+  maxCount: defaultOnError(int().gte(0).max(4294967295, {
     error: "Invalid value: Expected uint32 to be <= 4294967295"
-  }).nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  }).nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesOpenFilesCapabilities = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesDiagnosticsCapabilities = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesContextCapabilities = object({
   recentFiles: defaultOnError(zNesRecentFilesCapabilities.nullish(), () => void 0),
@@ -18763,12 +18815,12 @@ var zNesContextCapabilities = object({
   userActions: defaultOnError(zNesUserActionsCapabilities.nullish(), () => void 0),
   openFiles: defaultOnError(zNesOpenFilesCapabilities.nullish(), () => void 0),
   diagnostics: defaultOnError(zNesDiagnosticsCapabilities.nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesCapabilities = object({
   events: defaultOnError(zNesEventCapabilities.nullish(), () => void 0),
   context: defaultOnError(zNesContextCapabilities.nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zPositionEncodingKind = union([
   literal("utf-16"),
@@ -18776,53 +18828,61 @@ var zPositionEncodingKind = union([
   literal("utf-8")
 ]);
 var zAgentCapabilities = object({
-  loadSession: boolean2().optional().default(false),
-  promptCapabilities: zPromptCapabilities.optional().default({
+  loadSession: defaultOnError(boolean2().optional().default(false), () => false),
+  promptCapabilities: defaultOnError(zPromptCapabilities.optional().default({
     image: false,
     audio: false,
     embeddedContext: false
-  }),
-  mcpCapabilities: zMcpCapabilities.optional().default({
+  }), () => ({
+    image: false,
+    audio: false,
+    embeddedContext: false
+  })),
+  mcpCapabilities: defaultOnError(zMcpCapabilities.optional().default({
     http: false,
     sse: false,
     acp: false
-  }),
-  sessionCapabilities: zSessionCapabilities.optional().default({}),
-  auth: zAgentAuthCapabilities.optional().default({}),
+  }), () => ({
+    http: false,
+    sse: false,
+    acp: false
+  })),
+  sessionCapabilities: defaultOnError(zSessionCapabilities.optional().default({}), () => ({})),
+  auth: defaultOnError(zAgentAuthCapabilities.optional().default({}), () => ({})),
   providers: defaultOnError(zProvidersCapabilities.nullish(), () => void 0),
   nes: defaultOnError(zNesCapabilities.nullish(), () => void 0),
   positionEncoding: defaultOnError(zPositionEncodingKind.nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zAuthMethodId = string2();
 var zAuthEnvVar = object({
   name: string2(),
-  label: string2().nullish(),
-  secret: boolean2().optional().default(true),
-  optional: boolean2().optional().default(false),
-  _meta: record(string2(), unknown()).nullish()
+  label: defaultOnError(string2().nullish(), () => void 0),
+  secret: defaultOnError(boolean2().optional().default(true), () => true),
+  optional: defaultOnError(boolean2().optional().default(false), () => false),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zAuthMethodEnvVar = object({
   id: zAuthMethodId,
   name: string2(),
-  description: string2().nullish(),
-  vars: array(zAuthEnvVar),
-  link: string2().nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  description: defaultOnError(string2().nullish(), () => void 0),
+  vars: requiredDefaultOnError(vecSkipError(zAuthEnvVar), () => []),
+  link: defaultOnError(string2().nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zAuthMethodTerminal = object({
   id: zAuthMethodId,
   name: string2(),
-  description: string2().nullish(),
-  args: array(string2()).optional(),
-  env: record(string2(), string2()).optional(),
-  _meta: record(string2(), unknown()).nullish()
+  description: defaultOnError(string2().nullish(), () => void 0),
+  args: defaultOnError(vecSkipError(string2()).optional(), () => []),
+  env: defaultOnError(record(string2(), string2()).optional(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zAuthMethodAgent = object({
   id: zAuthMethodId,
   name: string2(),
-  description: string2().nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  description: defaultOnError(string2().nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zAuthMethod = union([
   zAuthMethodEnvVar.and(object({
@@ -18835,13 +18895,13 @@ var zAuthMethod = union([
 ]);
 var zImplementation = object({
   name: string2(),
-  title: string2().nullish(),
+  title: defaultOnError(string2().nullish(), () => void 0),
   version: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zInitializeResponse = object({
   protocolVersion: zProtocolVersion,
-  agentCapabilities: zAgentCapabilities.optional().default({
+  agentCapabilities: defaultOnError(zAgentCapabilities.optional().default({
     loadSession: false,
     promptCapabilities: {
       image: false,
@@ -18855,14 +18915,29 @@ var zInitializeResponse = object({
     },
     sessionCapabilities: {},
     auth: {}
-  }),
+  }), () => ({
+    loadSession: false,
+    promptCapabilities: {
+      image: false,
+      audio: false,
+      embeddedContext: false
+    },
+    mcpCapabilities: {
+      http: false,
+      sse: false,
+      acp: false
+    },
+    sessionCapabilities: {},
+    auth: {}
+  })),
   authMethods: defaultOnError(vecSkipError(zAuthMethod).optional().default([]), () => []),
   agentInfo: defaultOnError(zImplementation.nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zAuthenticateResponse = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
+var zProviderId = string2();
 var zLlmProtocol = union([
   literal("anthropic"),
   literal("openai"),
@@ -18874,39 +18949,39 @@ var zLlmProtocol = union([
 var zProviderCurrentConfig = object({
   apiType: zLlmProtocol,
   baseUrl: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zProviderInfo = object({
-  id: string2(),
+  providerId: zProviderId,
   supported: requiredDefaultOnError(vecSkipError(zLlmProtocol), () => []),
   required: boolean2(),
   current: zProviderCurrentConfig.nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zListProvidersResponse = object({
-  providers: requiredDefaultOnError(vecSkipError(zProviderInfo), () => []),
-  _meta: record(string2(), unknown()).nullish()
+  providers: array(zProviderInfo),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSetProviderResponse = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zDisableProviderResponse = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zLogoutResponse = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSessionModeId = string2();
 var zSessionMode = object({
   id: zSessionModeId,
   name: string2(),
-  description: string2().nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  description: defaultOnError(string2().nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSessionModeState = object({
   currentModeId: zSessionModeId,
   availableModes: requiredDefaultOnError(vecSkipError(zSessionMode), () => []),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSessionConfigId = string2();
 var zSessionConfigOptionCategory = union([
@@ -18920,15 +18995,15 @@ var zSessionConfigValueId = string2();
 var zSessionConfigSelectOption = object({
   value: zSessionConfigValueId,
   name: string2(),
-  description: string2().nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  description: defaultOnError(string2().nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSessionConfigGroupId = string2();
 var zSessionConfigSelectGroup = object({
   group: zSessionConfigGroupId,
   name: string2(),
-  options: array(zSessionConfigSelectOption),
-  _meta: record(string2(), unknown()).nullish()
+  options: requiredDefaultOnError(vecSkipError(zSessionConfigSelectOption), () => []),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSessionConfigSelectOptions = union([
   array(zSessionConfigSelectOption),
@@ -18951,57 +19026,57 @@ var zSessionConfigOption = intersection(union([
 ]), object({
   id: zSessionConfigId,
   name: string2(),
-  description: string2().nullish(),
+  description: defaultOnError(string2().nullish(), () => void 0),
   category: defaultOnError(zSessionConfigOptionCategory.nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 }));
 var zNewSessionResponse = object({
   sessionId: zSessionId,
   modes: defaultOnError(zSessionModeState.nullish(), () => void 0),
   configOptions: defaultOnError(vecSkipError(zSessionConfigOption).nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zLoadSessionResponse = object({
   modes: defaultOnError(zSessionModeState.nullish(), () => void 0),
   configOptions: defaultOnError(vecSkipError(zSessionConfigOption).nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSessionInfo = object({
   sessionId: zSessionId,
   cwd: string2(),
-  additionalDirectories: array(string2()).optional(),
+  additionalDirectories: defaultOnError(vecSkipError(string2()).optional(), () => []),
   title: defaultOnError(string2().nullish(), () => void 0),
   updatedAt: defaultOnError(string2().nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zListSessionsResponse = object({
   sessions: requiredDefaultOnError(vecSkipError(zSessionInfo), () => []),
-  nextCursor: string2().nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  nextCursor: defaultOnError(string2().nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zDeleteSessionResponse = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zForkSessionResponse = object({
   sessionId: zSessionId,
   modes: defaultOnError(zSessionModeState.nullish(), () => void 0),
   configOptions: defaultOnError(vecSkipError(zSessionConfigOption).nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zResumeSessionResponse = object({
   modes: defaultOnError(zSessionModeState.nullish(), () => void 0),
   configOptions: defaultOnError(vecSkipError(zSessionConfigOption).nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zCloseSessionResponse = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSetSessionModeResponse = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSetSessionConfigOptionResponse = object({
   configOptions: requiredDefaultOnError(vecSkipError(zSessionConfigOption), () => []),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zStopReason = union([
   literal("end_turn"),
@@ -19014,20 +19089,21 @@ var zUsage = object({
   totalTokens: number2(),
   inputTokens: number2(),
   outputTokens: number2(),
-  thoughtTokens: number2().nullish(),
-  cachedReadTokens: number2().nullish(),
-  cachedWriteTokens: number2().nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  thoughtTokens: defaultOnError(number2().nullish(), () => void 0),
+  cachedReadTokens: defaultOnError(number2().nullish(), () => void 0),
+  cachedWriteTokens: defaultOnError(number2().nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zPromptResponse = object({
   stopReason: zStopReason,
   usage: defaultOnError(zUsage.nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zStartNesResponse = object({
   sessionId: zSessionId,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
+var zNesSuggestionId = string2();
 var zPosition = object({
   line: int().gte(0).max(4294967295, {
     error: "Invalid value: Expected uint32 to be <= 4294967295"
@@ -19035,45 +19111,45 @@ var zPosition = object({
   character: int().gte(0).max(4294967295, {
     error: "Invalid value: Expected uint32 to be <= 4294967295"
   }),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zRange = object({
   start: zPosition,
   end: zPosition,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesTextEdit = object({
   range: zRange,
   newText: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesEditSuggestion = object({
-  id: string2(),
+  id: zNesSuggestionId,
   uri: string2(),
   edits: array(zNesTextEdit),
   cursorPosition: defaultOnError(zPosition.nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesJumpSuggestion = object({
-  id: string2(),
+  id: zNesSuggestionId,
   uri: string2(),
   position: zPosition,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesRenameSuggestion = object({
-  id: string2(),
+  id: zNesSuggestionId,
   uri: string2(),
   position: zPosition,
   newName: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesSearchAndReplaceSuggestion = object({
-  id: string2(),
+  id: zNesSuggestionId,
   uri: string2(),
   search: string2(),
   replace: string2(),
   isRegex: boolean2().nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesSuggestion = union([
   zNesEditSuggestion.and(object({
@@ -19090,11 +19166,11 @@ var zNesSuggestion = union([
   }))
 ]);
 var zSuggestNesResponse = object({
-  suggestions: requiredDefaultOnError(vecSkipError(zNesSuggestion), () => []),
-  _meta: record(string2(), unknown()).nullish()
+  suggestions: array(zNesSuggestion),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zCloseNesResponse = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zExtResponse = unknown();
 var zMessageMcpResponse = unknown();
@@ -19107,7 +19183,6 @@ var zErrorCode = union([
   literal(-32800),
   literal(-32e3),
   literal(-32002),
-  literal(-32042),
   int().min(-2147483648, {
     error: "Invalid value: Expected int32 to be >= -2147483648"
   }).max(2147483647, {
@@ -19117,7 +19192,7 @@ var zErrorCode = union([
 var zError = object({
   code: zErrorCode,
   message: string2(),
-  data: unknown().optional()
+  data: defaultOnError(unknown().optional(), () => void 0)
 });
 var zAgentResponse = union([
   object({
@@ -19154,19 +19229,19 @@ var zAgentResponse = union([
 var zMessageId = string2();
 var zContentChunk = object({
   content: zContentBlock,
-  messageId: zMessageId.nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  messageId: defaultOnError(zMessageId.nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zToolCall = object({
   toolCallId: zToolCallId,
   title: string2(),
-  kind: zToolKind.optional(),
-  status: zToolCallStatus.optional(),
+  kind: defaultOnError(zToolKind.optional(), () => void 0),
+  status: defaultOnError(zToolCallStatus.optional(), () => void 0),
   content: defaultOnError(vecSkipError(zToolCallContent).optional(), () => []),
   locations: defaultOnError(vecSkipError(zToolCallLocation).optional(), () => []),
-  rawInput: unknown().optional(),
-  rawOutput: unknown().optional(),
-  _meta: record(string2(), unknown()).nullish()
+  rawInput: defaultOnError(unknown().optional(), () => void 0),
+  rawOutput: defaultOnError(unknown().optional(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zPlanEntryPriority = union([
   literal("high"),
@@ -19182,27 +19257,27 @@ var zPlanEntry = object({
   content: string2(),
   priority: zPlanEntryPriority,
   status: zPlanEntryStatus,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zPlan = object({
   entries: requiredDefaultOnError(vecSkipError(zPlanEntry), () => []),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zPlanId = string2();
 var zPlanItems = object({
-  id: zPlanId,
+  planId: zPlanId,
   entries: requiredDefaultOnError(vecSkipError(zPlanEntry), () => []),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zPlanFile = object({
-  id: zPlanId,
+  planId: zPlanId,
   uri: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zPlanMarkdown = object({
-  id: zPlanId,
+  planId: zPlanId,
   content: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zPlanUpdateContent = union([
   zPlanItems.and(object({
@@ -19217,50 +19292,50 @@ var zPlanUpdateContent = union([
 ]);
 var zPlanUpdate = object({
   plan: zPlanUpdateContent,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zPlanRemoved = object({
-  id: zPlanId,
-  _meta: record(string2(), unknown()).nullish()
+  planId: zPlanId,
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zUnstructuredCommandInput = object({
   hint: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zAvailableCommandInput = zUnstructuredCommandInput;
 var zAvailableCommand = object({
   name: string2(),
   description: string2(),
   input: defaultOnError(zAvailableCommandInput.nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zAvailableCommandsUpdate = object({
   availableCommands: requiredDefaultOnError(vecSkipError(zAvailableCommand), () => []),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zCurrentModeUpdate = object({
   currentModeId: zSessionModeId,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zConfigOptionUpdate = object({
   configOptions: requiredDefaultOnError(vecSkipError(zSessionConfigOption), () => []),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSessionInfoUpdate = object({
-  title: string2().nullish(),
-  updatedAt: string2().nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  title: defaultOnError(string2().nullish(), () => void 0),
+  updatedAt: defaultOnError(string2().nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zCost = object({
   amount: number2(),
   currency: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zUsageUpdate = object({
   used: number2(),
   size: number2(),
   cost: defaultOnError(zCost.nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSessionUpdate = union([
   zContentChunk.and(object({
@@ -19306,17 +19381,17 @@ var zSessionUpdate = union([
 var zSessionNotification = object({
   sessionId: zSessionId,
   update: zSessionUpdate,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zCompleteElicitationNotification = object({
   elicitationId: zElicitationId,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zMessageMcpNotification = object({
   connectionId: zMcpConnectionId,
   method: string2(),
-  params: record(string2(), unknown()).nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  params: defaultOnError(record(string2(), unknown()).nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zExtNotification = unknown();
 var zAgentNotification = object({
@@ -19329,124 +19404,128 @@ var zAgentNotification = object({
   ]).nullish()
 });
 var zFileSystemCapabilities = object({
-  readTextFile: boolean2().optional().default(false),
-  writeTextFile: boolean2().optional().default(false),
-  _meta: record(string2(), unknown()).nullish()
+  readTextFile: defaultOnError(boolean2().optional().default(false), () => false),
+  writeTextFile: defaultOnError(boolean2().optional().default(false), () => false),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zBooleanConfigOptionCapabilities = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSessionConfigOptionsCapabilities = object({
   boolean: defaultOnError(zBooleanConfigOptionCapabilities.nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zClientSessionCapabilities = object({
   configOptions: defaultOnError(zSessionConfigOptionsCapabilities.nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zPlanCapabilities = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zAuthCapabilities = object({
-  terminal: boolean2().optional().default(false),
-  _meta: record(string2(), unknown()).nullish()
+  terminal: defaultOnError(boolean2().optional().default(false), () => false),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zElicitationFormCapabilities = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zElicitationUrlCapabilities = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zElicitationCapabilities = object({
   form: defaultOnError(zElicitationFormCapabilities.nullish(), () => void 0),
   url: defaultOnError(zElicitationUrlCapabilities.nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesJumpCapabilities = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesRenameCapabilities = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesSearchAndReplaceCapabilities = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zClientNesCapabilities = object({
   jump: defaultOnError(zNesJumpCapabilities.nullish(), () => void 0),
   rename: defaultOnError(zNesRenameCapabilities.nullish(), () => void 0),
   searchAndReplace: defaultOnError(zNesSearchAndReplaceCapabilities.nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zClientCapabilities = object({
-  fs: zFileSystemCapabilities.optional().default({ readTextFile: false, writeTextFile: false }),
-  terminal: boolean2().optional().default(false),
+  fs: defaultOnError(zFileSystemCapabilities.optional().default({ readTextFile: false, writeTextFile: false }), () => ({ readTextFile: false, writeTextFile: false })),
+  terminal: defaultOnError(boolean2().optional().default(false), () => false),
   session: defaultOnError(zClientSessionCapabilities.nullish(), () => void 0),
   plan: defaultOnError(zPlanCapabilities.nullish(), () => void 0),
-  auth: zAuthCapabilities.optional().default({ terminal: false }),
+  auth: defaultOnError(zAuthCapabilities.optional().default({ terminal: false }), () => ({ terminal: false })),
   elicitation: defaultOnError(zElicitationCapabilities.nullish(), () => void 0),
   nes: defaultOnError(zClientNesCapabilities.nullish(), () => void 0),
   positionEncodings: defaultOnError(vecSkipError(zPositionEncodingKind).optional(), () => []),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zInitializeRequest = object({
   protocolVersion: zProtocolVersion,
-  clientCapabilities: zClientCapabilities.optional().default({
+  clientCapabilities: defaultOnError(zClientCapabilities.optional().default({
     fs: { readTextFile: false, writeTextFile: false },
     terminal: false,
     auth: { terminal: false }
-  }),
+  }), () => ({
+    fs: { readTextFile: false, writeTextFile: false },
+    terminal: false,
+    auth: { terminal: false }
+  })),
   clientInfo: defaultOnError(zImplementation.nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zAuthenticateRequest = object({
   methodId: zAuthMethodId,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zListProvidersRequest = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSetProviderRequest = object({
-  id: string2(),
+  providerId: zProviderId,
   apiType: zLlmProtocol,
   baseUrl: string2(),
   headers: record(string2(), string2()).optional(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zDisableProviderRequest = object({
-  id: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  providerId: zProviderId,
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zLogoutRequest = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zHttpHeader = object({
   name: string2(),
   value: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zMcpServerHttp = object({
   name: string2(),
   url: string2(),
   headers: array(zHttpHeader),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zMcpServerSse = object({
   name: string2(),
   url: string2(),
   headers: array(zHttpHeader),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zMcpServerAcp = object({
   name: string2(),
-  id: zMcpServerAcpId,
-  _meta: record(string2(), unknown()).nullish()
+  serverId: zMcpServerAcpId,
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zMcpServerStdio = object({
   name: string2(),
   command: string2(),
   args: array(string2()),
   env: array(zEnvVariable),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zMcpServer = union([
   zMcpServerHttp.and(object({
@@ -19462,48 +19541,48 @@ var zMcpServer = union([
 ]);
 var zNewSessionRequest = object({
   cwd: string2(),
-  additionalDirectories: array(string2()).optional(),
-  mcpServers: array(zMcpServer),
-  _meta: record(string2(), unknown()).nullish()
+  additionalDirectories: defaultOnError(vecSkipError(string2()).optional(), () => []),
+  mcpServers: requiredDefaultOnError(vecSkipError(zMcpServer), () => []),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zLoadSessionRequest = object({
-  mcpServers: array(zMcpServer),
+  mcpServers: requiredDefaultOnError(vecSkipError(zMcpServer), () => []),
   cwd: string2(),
-  additionalDirectories: array(string2()).optional(),
+  additionalDirectories: defaultOnError(vecSkipError(string2()).optional(), () => []),
   sessionId: zSessionId,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zListSessionsRequest = object({
   cwd: string2().nullish(),
   cursor: string2().nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zDeleteSessionRequest = object({
   sessionId: zSessionId,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zForkSessionRequest = object({
   sessionId: zSessionId,
   cwd: string2(),
-  additionalDirectories: array(string2()).optional(),
-  mcpServers: array(zMcpServer).optional(),
-  _meta: record(string2(), unknown()).nullish()
+  additionalDirectories: defaultOnError(vecSkipError(string2()).optional(), () => []),
+  mcpServers: defaultOnError(vecSkipError(zMcpServer).optional(), () => []),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zResumeSessionRequest = object({
   sessionId: zSessionId,
   cwd: string2(),
-  additionalDirectories: array(string2()).optional(),
-  mcpServers: array(zMcpServer).optional(),
-  _meta: record(string2(), unknown()).nullish()
+  additionalDirectories: defaultOnError(vecSkipError(string2()).optional(), () => []),
+  mcpServers: defaultOnError(vecSkipError(zMcpServer).optional(), () => []),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zCloseSessionRequest = object({
   sessionId: zSessionId,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSetSessionModeRequest = object({
   sessionId: zSessionId,
   modeId: zSessionModeId,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSetSessionConfigOptionRequest = intersection(union([
   object({
@@ -19516,29 +19595,29 @@ var zSetSessionConfigOptionRequest = intersection(union([
 ]), object({
   sessionId: zSessionId,
   configId: zSessionConfigId,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 }));
 var zPromptRequest = object({
   sessionId: zSessionId,
   prompt: array(zContentBlock),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zWorkspaceFolder = object({
   uri: string2(),
   name: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesRepository = object({
   name: string2(),
   owner: string2(),
   remoteUrl: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zStartNesRequest = object({
-  workspaceUri: string2().nullish(),
-  workspaceFolders: defaultOnError(vecSkipError(zWorkspaceFolder).nullish(), () => void 0),
+  workspaceUri: defaultOnError(string2().nullish(), () => void 0),
+  workspaceFolders: array(zWorkspaceFolder).nullish(),
   repository: defaultOnError(zNesRepository.nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesTriggerKind = union([
   literal("automatic"),
@@ -19549,7 +19628,7 @@ var zNesRecentFile = object({
   uri: string2(),
   languageId: string2(),
   text: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesExcerpt = object({
   startLine: int().gte(0).max(4294967295, {
@@ -19559,31 +19638,31 @@ var zNesExcerpt = object({
     error: "Invalid value: Expected uint32 to be <= 4294967295"
   }),
   text: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesRelatedSnippet = object({
   uri: string2(),
   excerpts: array(zNesExcerpt),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesEditHistoryEntry = object({
   uri: string2(),
   diff: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesUserAction = object({
   action: string2(),
   uri: string2(),
   position: zPosition,
   timestampMs: number2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesOpenFile = object({
   uri: string2(),
   languageId: string2(),
   visibleRange: defaultOnError(zRange.nullish(), () => void 0),
   lastFocusedMs: defaultOnError(number2().nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesDiagnosticSeverity = union([
   literal("error"),
@@ -19596,30 +19675,30 @@ var zNesDiagnostic = object({
   range: zRange,
   severity: zNesDiagnosticSeverity,
   message: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesSuggestContext = object({
-  recentFiles: defaultOnError(vecSkipError(zNesRecentFile).nullish(), () => void 0),
-  relatedSnippets: defaultOnError(vecSkipError(zNesRelatedSnippet).nullish(), () => void 0),
-  editHistory: defaultOnError(vecSkipError(zNesEditHistoryEntry).nullish(), () => void 0),
-  userActions: defaultOnError(vecSkipError(zNesUserAction).nullish(), () => void 0),
-  openFiles: defaultOnError(vecSkipError(zNesOpenFile).nullish(), () => void 0),
-  diagnostics: defaultOnError(vecSkipError(zNesDiagnostic).nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  recentFiles: array(zNesRecentFile).nullish(),
+  relatedSnippets: array(zNesRelatedSnippet).nullish(),
+  editHistory: array(zNesEditHistoryEntry).nullish(),
+  userActions: array(zNesUserAction).nullish(),
+  openFiles: array(zNesOpenFile).nullish(),
+  diagnostics: array(zNesDiagnostic).nullish(),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSuggestNesRequest = object({
   sessionId: zSessionId,
   uri: string2(),
   version: number2(),
   position: zPosition,
-  selection: defaultOnError(zRange.nullish(), () => void 0),
+  selection: zRange.nullish(),
   triggerKind: zNesTriggerKind,
-  context: defaultOnError(zNesSuggestContext.nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  context: zNesSuggestContext.nullish(),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zCloseNesRequest = object({
   sessionId: zSessionId,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zClientRequest = object({
   id: zRequestId,
@@ -19649,15 +19728,15 @@ var zClientRequest = object({
   ]).nullish()
 });
 var zWriteTextFileResponse = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zReadTextFileResponse = object({
   content: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSelectedPermissionOutcome = object({
   optionId: zPermissionOptionId,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zRequestPermissionOutcome = union([
   object({
@@ -19669,37 +19748,37 @@ var zRequestPermissionOutcome = union([
 ]);
 var zRequestPermissionResponse = object({
   outcome: zRequestPermissionOutcome,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zCreateTerminalResponse = object({
   terminalId: zTerminalId,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zTerminalExitStatus = object({
-  exitCode: int().gte(0).max(4294967295, {
+  exitCode: defaultOnError(int().gte(0).max(4294967295, {
     error: "Invalid value: Expected uint32 to be <= 4294967295"
-  }).nullish(),
-  signal: string2().nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  }).nullish(), () => void 0),
+  signal: defaultOnError(string2().nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zTerminalOutputResponse = object({
   output: string2(),
   truncated: boolean2(),
-  exitStatus: zTerminalExitStatus.nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  exitStatus: defaultOnError(zTerminalExitStatus.nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zReleaseTerminalResponse = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zWaitForTerminalExitResponse = object({
-  exitCode: int().gte(0).max(4294967295, {
+  exitCode: defaultOnError(int().gte(0).max(4294967295, {
     error: "Invalid value: Expected uint32 to be <= 4294967295"
-  }).nullish(),
-  signal: string2().nullish(),
-  _meta: record(string2(), unknown()).nullish()
+  }).nullish(), () => void 0),
+  signal: defaultOnError(string2().nullish(), () => void 0),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zKillTerminalResponse = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zElicitationContentValue = union([
   string2(),
@@ -19711,7 +19790,7 @@ var zElicitationContentValue = union([
 var zElicitationAcceptAction = object({
   content: record(string2(), zElicitationContentValue).nullish()
 });
-var zCreateElicitationResponse = intersection(union([
+var zCreateElicitationResponse = preserveCustomPayload(intersection(union([
   zElicitationAcceptAction.and(object({
     action: literal("accept")
   })),
@@ -19720,16 +19799,19 @@ var zCreateElicitationResponse = intersection(union([
   }),
   object({
     action: literal("cancel")
-  })
+  }),
+  excludeKnownTags(object({
+    action: string2()
+  }), "action", ["accept", "cancel", "decline"])
 ]), object({
-  _meta: record(string2(), unknown()).nullish()
-}));
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
+})), "action", ["accept", "cancel", "decline"]);
 var zConnectMcpResponse = object({
   connectionId: zMcpConnectionId,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zDisconnectMcpResponse = object({
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zClientResponse = union([
   object({
@@ -19746,8 +19828,8 @@ var zClientResponse = union([
       zCreateElicitationResponse,
       zConnectMcpResponse,
       zDisconnectMcpResponse,
-      zExtResponse,
-      zMessageMcpResponse
+      zMessageMcpResponse,
+      zExtResponse
     ])
   }),
   object({
@@ -19757,7 +19839,7 @@ var zClientResponse = union([
 ]);
 var zCancelNotification = object({
   sessionId: zSessionId,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zDidOpenDocumentNotification = object({
   sessionId: zSessionId,
@@ -19765,29 +19847,29 @@ var zDidOpenDocumentNotification = object({
   languageId: string2(),
   version: number2(),
   text: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zTextDocumentContentChangeEvent = object({
   range: zRange.nullish(),
   text: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zDidChangeDocumentNotification = object({
   sessionId: zSessionId,
   uri: string2(),
   version: number2(),
-  contentChanges: array(zTextDocumentContentChangeEvent),
-  _meta: record(string2(), unknown()).nullish()
+  contentChanges: requiredDefaultOnError(vecSkipError(zTextDocumentContentChangeEvent), () => []),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zDidCloseDocumentNotification = object({
   sessionId: zSessionId,
   uri: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zDidSaveDocumentNotification = object({
   sessionId: zSessionId,
   uri: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zDidFocusDocumentNotification = object({
   sessionId: zSessionId,
@@ -19795,12 +19877,12 @@ var zDidFocusDocumentNotification = object({
   version: number2(),
   position: zPosition,
   visibleRange: zRange,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zAcceptNesNotification = object({
   sessionId: zSessionId,
-  id: string2(),
-  _meta: record(string2(), unknown()).nullish()
+  id: zNesSuggestionId,
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zNesRejectReason = union([
   literal("rejected"),
@@ -19810,9 +19892,9 @@ var zNesRejectReason = union([
 ]);
 var zRejectNesNotification = object({
   sessionId: zSessionId,
-  id: string2(),
+  id: zNesSuggestionId,
   reason: defaultOnError(zNesRejectReason.nullish(), () => void 0),
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zClientNotification = object({
   method: string2(),
@@ -19831,98 +19913,54 @@ var zClientNotification = object({
 });
 var zCancelRequestNotification = object({
   requestId: zRequestId,
-  _meta: record(string2(), unknown()).nullish()
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 
-// node_modules/@agentclientprotocol/sdk/dist/stream.js
-function ndJsonStream(output, input) {
-  const textEncoder = new TextEncoder();
-  const textDecoder = new TextDecoder();
-  let cancelled = false;
-  let inputReader;
-  const readable = new ReadableStream({
-    async start(controller) {
-      let content = "";
-      const reader = input.getReader();
-      inputReader = reader;
-      try {
-        while (true) {
-          const { value, done } = await reader.read();
-          if (cancelled) {
-            return;
-          }
-          if (done) {
-            content += textDecoder.decode();
-            break;
-          }
-          if (!value) {
-            continue;
-          }
-          content += textDecoder.decode(value, { stream: true });
-          const lines = content.split("\n");
-          content = lines.pop() || "";
-          for (const line of lines) {
-            if (cancelled) {
-              return;
-            }
-            const trimmedLine2 = line.trim();
-            if (trimmedLine2) {
-              try {
-                const message = JSON.parse(trimmedLine2);
-                controller.enqueue(message);
-              } catch (err) {
-                console.error("Failed to parse JSON message:", trimmedLine2, err);
-              }
-            }
-          }
-        }
-        if (cancelled) {
-          return;
-        }
-        const trimmedLine = content.trim();
-        if (trimmedLine) {
-          try {
-            const message = JSON.parse(trimmedLine);
-            controller.enqueue(message);
-          } catch (err) {
-            console.error("Failed to parse JSON message:", trimmedLine, err);
-          }
-        }
-      } catch (err) {
-        if (cancelled) {
-          return;
-        }
-        controller.error(err);
-        return;
-      } finally {
-        if (inputReader === reader) {
-          inputReader = void 0;
-        }
-        reader.releaseLock();
-      }
-      if (cancelled) {
-        return;
-      }
-      controller.close();
-    },
-    cancel(reason) {
-      cancelled = true;
-      return inputReader?.cancel(reason);
-    }
-  });
-  const writable = new WritableStream({
-    async write(message) {
-      const content = JSON.stringify(message) + "\n";
-      const writer = output.getWriter();
-      try {
-        await writer.write(textEncoder.encode(content));
-      } finally {
-        writer.releaseLock();
-      }
-    }
-  });
-  return { readable, writable };
-}
+// node_modules/@agentclientprotocol/sdk/dist/schema/guards.gen.js
+function tagOf(value, key) {
+  return typeof value === "object" && value !== null ? value[key] : void 0;
+}
+var zGuardCreateElicitationRequestForm = zElicitationFormMode.and(object({ mode: literal("form") })).and(object({ message: string2() }));
+var zGuardCreateElicitationRequestUrl = zElicitationUrlMode.and(object({ mode: literal("url") })).and(object({ message: string2() }));
+var zGuardCreateElicitationRequestCustom = union([zElicitationSessionScope, zElicitationRequestScope]).and(object({ message: string2() }));
+var zGuardElicitationPropertySchemaString = zStringPropertySchema.and(object({ type: literal("string") }));
+var zGuardElicitationPropertySchemaNumber = zNumberPropertySchema.and(object({ type: literal("number") }));
+var zGuardElicitationPropertySchemaInteger = zIntegerPropertySchema.and(object({ type: literal("integer") }));
+var zGuardElicitationPropertySchemaBoolean = zBooleanPropertySchema.and(object({ type: literal("boolean") }));
+var zGuardElicitationPropertySchemaArray = zMultiSelectPropertySchema.and(object({ type: literal("array") }));
+var zGuardMultiSelectItemsString = zStringMultiSelectItems.and(object({ type: literal("string") }));
+var zGuardCreateElicitationResponseAccept = zElicitationAcceptAction.and(object({ action: literal("accept") }));
+var zGuardCreateElicitationResponseDecline = object({
+  action: literal("decline")
+});
+var zGuardCreateElicitationResponseCancel = object({
+  action: literal("cancel")
+});
+var CreateElicitationResponse = {
+  /** Narrow to the `accept` variant, validating its payload. */
+  isAccept(value) {
+    return tagOf(value, "action") === "accept" && zGuardCreateElicitationResponseAccept.safeParse(value).success;
+  },
+  /** Narrow to the `decline` variant, validating its payload. */
+  isDecline(value) {
+    return tagOf(value, "action") === "decline" && zGuardCreateElicitationResponseDecline.safeParse(value).success;
+  },
+  /** Narrow to the `cancel` variant, validating its payload. */
+  isCancel(value) {
+    return tagOf(value, "action") === "cancel" && zGuardCreateElicitationResponseCancel.safeParse(value).success;
+  },
+  /**
+   * Narrow to a custom or future variant: the `action` tag matches no known variant.
+   *
+   * TypeScript keeps the known variants in the narrowed union (they are
+   * structural subtypes of the catch-all), so read vendor payload keys
+   * via a widening cast: `(value as Record<string, unknown>).someKey`.
+   */
+  isCustom(value) {
+    const tag = tagOf(value, "action");
+    return typeof tag === "string" && !["accept", "cancel", "decline"].includes(tag);
+  }
+};
 
 // node_modules/@agentclientprotocol/sdk/dist/jsonrpc.js
 var CANCEL_REQUEST_METHOD = "$/cancel_request";
@@ -20365,6 +20403,10 @@ var Connection = class {
     if (this.abortController.signal.aborted) {
       return;
     }
+    if (!isRecord(message)) {
+      console.error("Invalid message", { message });
+      return;
+    }
     if ("method" in message) {
       if (!("id" in message)) {
         this.handleProtocolNotification(message);
@@ -20454,7 +20496,7 @@ var Connection = class {
       pendingResponse.cleanup?.();
       if ("result" in response) {
         pendingResponse.resolve(response.result);
-      } else if ("error" in response) {
+      } else if ("error" in response && isRecord(response.error)) {
         const { code, message, data } = response.error;
         pendingResponse.reject(new RequestError(code, message, data));
       } else {
@@ -20660,6 +20702,147 @@ var RequestError = class _RequestError extends Error {
   }
 };
 
+// node_modules/@agentclientprotocol/sdk/dist/line-buffer.js
+var newline = 10;
+var LineBuffer = class {
+  /** Bytes of the current (incomplete) line, carried across chunks. */
+  #pending = [];
+  /**
+   * Consumes a chunk, returning each complete line without its trailing
+   * newline.
+   */
+  push(chunk) {
+    const lines = [];
+    let start = 0;
+    let newlineIndex = chunk.indexOf(newline, start);
+    while (newlineIndex !== -1) {
+      lines.push(this.#takeLine(chunk.subarray(start, newlineIndex)));
+      start = newlineIndex + 1;
+      newlineIndex = chunk.indexOf(newline, start);
+    }
+    if (start < chunk.byteLength) {
+      this.#pending.push(start === 0 ? chunk : new Uint8Array(chunk.subarray(start)));
+    }
+    return lines;
+  }
+  /**
+   * Returns the trailing unterminated line and resets the buffer, or
+   * undefined if no bytes are buffered.
+   */
+  flush() {
+    if (this.#pending.length === 0) {
+      return void 0;
+    }
+    return this.#takeLine(new Uint8Array(0));
+  }
+  #takeLine(tail) {
+    if (this.#pending.length === 0) {
+      return tail;
+    }
+    let total = tail.byteLength;
+    for (const part of this.#pending) {
+      total += part.byteLength;
+    }
+    const line = new Uint8Array(total);
+    let offset = 0;
+    for (const part of this.#pending) {
+      line.set(part, offset);
+      offset += part.byteLength;
+    }
+    line.set(tail, offset);
+    this.#pending = [];
+    return line;
+  }
+};
+
+// node_modules/@agentclientprotocol/sdk/dist/stream.js
+function ndJsonStream(output, input) {
+  const textEncoder = new TextEncoder();
+  const textDecoder = new TextDecoder();
+  let cancelled = false;
+  let inputReader;
+  const readable = new ReadableStream({
+    async start(controller) {
+      const lines = new LineBuffer();
+      const enqueueLine = (lineBytes) => {
+        const trimmedLine = textDecoder.decode(lineBytes).trim();
+        if (trimmedLine) {
+          try {
+            const message = JSON.parse(trimmedLine);
+            if (isRecord(message)) {
+              controller.enqueue(message);
+            } else {
+              console.warn("Skipping JSON line that is not an object:", trimmedLine);
+            }
+          } catch (err) {
+            console.error("Failed to parse JSON message:", trimmedLine, err);
+          }
+        }
+      };
+      const reader = input.getReader();
+      inputReader = reader;
+      try {
+        while (true) {
+          const { value, done } = await reader.read();
+          if (cancelled) {
+            return;
+          }
+          if (done) {
+            break;
+          }
+          if (!value) {
+            continue;
+          }
+          for (const line of lines.push(value)) {
+            enqueueLine(line);
+            if (cancelled) {
+              return;
+            }
+          }
+        }
+        if (cancelled) {
+          return;
+        }
+        const lastLine = lines.flush();
+        if (lastLine) {
+          enqueueLine(lastLine);
+        }
+      } catch (err) {
+        if (cancelled) {
+          return;
+        }
+        controller.error(err);
+        return;
+      } finally {
+        if (inputReader === reader) {
+          inputReader = void 0;
+        }
+        reader.releaseLock();
+      }
+      if (cancelled) {
+        return;
+      }
+      controller.close();
+    },
+    cancel(reason) {
+      cancelled = true;
+      return inputReader?.cancel(reason);
+    }
+  });
+  const writable = new WritableStream({
+    async write(message) {
+      const content = JSON.stringify(message) + "\n";
+      const writer = output.getWriter();
+      try {
+        await writer.write(textEncoder.encode(content));
+      } finally {
+        writer.releaseLock();
+      }
+    }
+  });
+  return { readable, writable };
+}
+
 // node_modules/@agentclientprotocol/sdk/dist/acp.js
 function emptyObjectResponse(response) {
   return response ?? {};
@@ -23032,50 +23215,62 @@ function recoverCorruptedDiff(diff) {
 }
 
 // src/ContentChunks.ts
-function createUserMessageChunk(content, messageId) {
+function createCodexMessagePhaseMeta(phase) {
+  if (!phase) {
+    return void 0;
+  }
+  return { codex: { phase } };
+}
+function createUserMessageChunk(content, messageId, meta3) {
   if (messageId) {
     return {
       sessionUpdate: "user_message_chunk",
       messageId,
-      content
+      content,
+      ...meta3 ? { _meta: meta3 } : {}
     };
   }
   return {
     sessionUpdate: "user_message_chunk",
-    content
+    content,
+    ...meta3 ? { _meta: meta3 } : {}
   };
 }
-function createAgentMessageChunk(content, messageId) {
+function createAgentMessageChunk(content, messageId, meta3) {
   if (messageId) {
     return {
       sessionUpdate: "agent_message_chunk",
       messageId,
-      content
+      content,
+      ...meta3 ? { _meta: meta3 } : {}
     };
   }
   return {
     sessionUpdate: "agent_message_chunk",
-    content
+    content,
+    ...meta3 ? { _meta: meta3 } : {}
   };
 }
-function createAgentThoughtChunk(content, messageId) {
+function createAgentThoughtChunk(content, messageId, meta3) {
   if (messageId) {
     return {
       sessionUpdate: "agent_thought_chunk",
       messageId,
-      content
+      content,
+      ...meta3 ? { _meta: meta3 } : {}
     };
   }
   return {
     sessionUpdate: "agent_thought_chunk",
-    content
+    content,
+    ...meta3 ? { _meta: meta3 } : {}
   };
 }
-function createAgentTextMessageChunk(text, messageId) {
-  return createAgentMessageChunk({ type: "text", text }, messageId);
+function createAgentTextMessageChunk(text, messageId, meta3) {
+  return createAgentMessageChunk({ type: "text", text }, messageId, meta3);
 }
-function createAgentTextThoughtChunk(text, messageId) {
-  return createAgentThoughtChunk({ type: "text", text }, messageId);
+function createAgentTextThoughtChunk(text, messageId, meta3) {
+  return createAgentThoughtChunk({ type: "text", text }, messageId, meta3);
 }
 
 // src/CodexEventHandler.ts
@@ -23090,6 +23285,7 @@ var CodexEventHandler = class {
   seenReasoningDeltaItemIds = /* @__PURE__ */ new Set();
   terminalCommandIds = /* @__PURE__ */ new Set();
   terminalCommandOutputIds = /* @__PURE__ */ new Set();
+  agentMessagePhases = /* @__PURE__ */ new Map();
   constructor(connection, sessionState) {
     this.connection = connection;
     this.sessionState = sessionState;
@@ -23233,7 +23429,8 @@ var CodexEventHandler = class {
     };
   }
   async createTextEvent(event) {
-    return createAgentTextMessageChunk(event.delta, event.itemId);
+    const phase = this.agentMessagePhases.get(event.itemId) ?? null;
+    return createAgentTextMessageChunk(event.delta, event.itemId, createCodexMessagePhaseMeta(phase));
   }
   async createConfigWarningEvent(event) {
     const detailsText = event.details ? `
@@ -23320,11 +23517,13 @@ ${event.details}` : "";
         return createImageGenerationStartUpdate(event.item);
       case "collabAgentToolCall":
         return createCollabAgentToolCallUpdate(event.item);
+      case "agentMessage":
+        this.rememberAgentMessagePhase(event.item);
+        return null;
       case "subAgentActivity":
       case "sleep":
       case "userMessage":
       case "hookPrompt":
-      case "agentMessage":
       case "reasoning":
       case "enteredReviewMode":
       case "exitedReviewMode":
@@ -23371,6 +23570,9 @@ ${event.details}` : "";
         return createWebSearchCompleteUpdate(event.item);
       case "collabAgentToolCall":
         return createCollabAgentToolCallCompleteUpdate(event.item);
+      case "agentMessage":
+        this.rememberAgentMessagePhase(event.item);
+        return null;
       case "exitedReviewMode":
         return this.createExitedReviewModeEvent(event.item);
       case "contextCompaction":
@@ -23380,12 +23582,14 @@ ${event.details}` : "";
       case "sleep":
       case "userMessage":
       case "hookPrompt":
-      case "agentMessage":
       case "enteredReviewMode":
       case "plan":
         return null;
     }
   }
+  rememberAgentMessagePhase(item) {
+    this.agentMessagePhases.set(item.id, item.phase);
+  }
   createCompletedReasoningEvent(item) {
     const parts = item.summary.length > 0 ? item.summary : item.content;
     const text = parts.filter((part) => part.length > 0).join("\n\n");
@@ -23941,6 +24145,14 @@ var McpApprovalOptionId = {
   Decline: "decline"
 };
 
+// src/ElicitationCapabilities.ts
+function clientSupportsFormElicitation(clientCapabilities) {
+  return clientCapabilities?.elicitation?.form != null;
+}
+function clientSupportsUrlElicitation(clientCapabilities) {
+  return clientCapabilities?.elicitation?.url != null;
+}
+
 // src/CodexElicitationHandler.ts
 var ELICITATION_OPTIONS = [
   { optionId: "accept", name: "Accept", kind: "allow_once" },
@@ -23963,6 +24175,124 @@ function parsePersistOptions(meta3) {
 function isMcpToolCallApproval(meta3) {
   return meta3 !== null && typeof meta3 === "object" && meta3["codex_approval_kind"] === "mcp_tool_call";
 }
+function isRecord2(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function normalizeJsonValue(value) {
+  if (value === null || value === void 0) {
+    return null;
+  }
+  if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+    return value;
+  }
+  if (typeof value === "bigint") {
+    return Number(value);
+  }
+  if (Array.isArray(value)) {
+    return value.map(normalizeJsonValue);
+  }
+  if (typeof value === "object") {
+    return Object.fromEntries(
+      Object.entries(value).filter(([, nested]) => nested !== void 0).map(([key, nested]) => [key, normalizeJsonValue(nested)])
+    );
+  }
+  return String(value);
+}
+function normalizeJsonObject(value) {
+  return Object.fromEntries(
+    Object.entries(value).filter(([, nested]) => nested !== void 0).map(([key, nested]) => [key, normalizeJsonValue(nested)])
+  );
+}
+function normalizeElicitationSchema(value) {
+  const normalized = normalizeElicitationSchemaValue(value);
+  if (!isRecord2(normalized)) {
+    return { type: "object", properties: {} };
+  }
+  return {
+    ...normalized,
+    type: "object"
+  };
+}
+function normalizeElicitationSchemaValue(value) {
+  if (typeof value === "bigint") {
+    return Number(value);
+  }
+  if (Array.isArray(value)) {
+    return value.map(normalizeElicitationSchemaValue);
+  }
+  if (!isRecord2(value)) {
+    return value;
+  }
+  const result = Object.fromEntries(
+    Object.entries(value).filter(([, nested]) => nested !== void 0).map(([key, nested]) => [key, normalizeElicitationSchemaValue(nested)])
+  );
+  if (result["type"] === "string" && Array.isArray(result["enum"]) && Array.isArray(result["enumNames"]) && !Array.isArray(result["oneOf"])) {
+    const values = result["enum"];
+    const names = result["enumNames"];
+    result["oneOf"] = values.map((value2, index) => ({
+      const: String(value2),
+      title: String(names[index] ?? value2)
+    }));
+    delete result["enum"];
+    delete result["enumNames"];
+  }
+  return result;
+}
+function metaRecord(meta3) {
+  return isRecord2(meta3) ? meta3 : null;
+}
+function persistChoiceOption(value) {
+  switch (value) {
+    case "once":
+      return { const: "once", title: "Allow once" };
+    case "session":
+      return { const: "session", title: "Allow for this session" };
+    case "always":
+      return { const: "always", title: "Allow and don't ask again" };
+  }
+}
+function addPersistChoiceToSchema(schema, persistOptions) {
+  if (persistOptions.size === 0) {
+    return schema;
+  }
+  const choices = ["once"];
+  if (persistOptions.has("session")) choices.push("session");
+  if (persistOptions.has("always")) choices.push("always");
+  return {
+    ...schema,
+    properties: {
+      ...schema.properties,
+      persist: {
+        type: "string",
+        title: "Approval scope",
+        oneOf: choices.map(persistChoiceOption),
+        default: "once"
+      }
+    },
+    required: Array.from(/* @__PURE__ */ new Set([...schema.required ?? [], "persist"]))
+  };
+}
+function contentRecord(content) {
+  return isRecord2(content) ? content : {};
+}
+function jsonObjectOrNull(content) {
+  const entries = Object.entries(content);
+  if (entries.length === 0) {
+    return null;
+  }
+  return Object.fromEntries(entries.map(([key, value]) => [key, normalizeJsonValue(value)]));
+}
+function elicitationResponseMeta(response, context, persist = void 0) {
+  const responseMeta = metaRecord(response._meta);
+  const meta3 = responseMeta ? normalizeJsonObject(responseMeta) : {};
+  if (context.isToolApproval) {
+    delete meta3["persist"];
+  }
+  if (persist === "session" || persist === "always") {
+    meta3["persist"] = persist;
+  }
+  return Object.keys(meta3).length === 0 ? null : meta3;
+}
 function buildToolApprovalOptions(persistOptions) {
   const options = [
     { optionId: McpApprovalOptionId.AllowOnce, name: "Allow", kind: "allow_once" }
@@ -23979,6 +24309,7 @@ function buildToolApprovalOptions(persistOptions) {
 var CodexElicitationHandler = class {
   connection;
   sessionState;
+  clientCapabilities;
   cancellationSignal;
   // In Rust, the MCP elicitation handler receives ElicitationRequestEvent directly from the MCP
   // protocol layer, where id is set to "mcp_tool_call_approval_<call_id>" — the call ID is extracted
@@ -23996,12 +24327,16 @@ var CodexElicitationHandler = class {
   // call's elicitation before starting the next, so there is at most one pending approval per
   // (threadId, serverName).
   pendingMcpApprovals = /* @__PURE__ */ new Map();
-  constructor(connection, sessionState, cancellationSignal) {
+  // The app-server handler exposes URL elicitationId, while serverRequest/resolved only exposes
+  // threadId here, so accepted URL elicitations are completed at thread scope.
+  pendingUrlElicitations = /* @__PURE__ */ new Map();
+  constructor(connection, sessionState, clientCapabilities = null, cancellationSignal) {
     this.connection = connection;
     this.sessionState = sessionState;
+    this.clientCapabilities = clientCapabilities;
     this.cancellationSignal = cancellationSignal;
   }
-  handleNotification(notification) {
+  async handleNotification(notification) {
     switch (notification.method) {
       case "item/started":
         this.handleItemStarted(notification.params);
@@ -24011,6 +24346,7 @@ var CodexElicitationHandler = class {
         return;
       case "serverRequest/resolved":
         this.clearThread(notification.params.threadId);
+        await this.completeUrlElicitations(notification.params.threadId);
         return;
       default:
         return;
@@ -24018,7 +24354,21 @@ var CodexElicitationHandler = class {
   }
   async handleElicitation(params) {
     try {
-      const { request, correlatedCallId } = this.buildPermissionRequest(params);
+      const context = this.createMcpElicitationContext(params);
+      if (this.shouldUseAcpElicitation(params)) {
+        const response2 = await this.connection.request(
+          methods.client.elicitation.create,
+          this.buildElicitationRequest(params, context),
+          this.requestOptions()
+        );
+        const result = this.convertElicitationResponse(response2, context);
+        if (params.mode === "url" && result.action === "accept") {
+          this.trackUrlElicitation(params.threadId, params.elicitationId);
+        }
+        await this.publishAcceptedMcpToolApproval(context, result.action === "accept");
+        return result;
+      }
+      const { request, correlatedCallId } = this.buildPermissionRequest(params, context);
       const response = await this.connection.request(
         methods.client.session.requestPermission,
         request,
@@ -24033,7 +24383,7 @@ var CodexElicitationHandler = class {
           });
         }
       }
-      return this.convertResponse(response);
+      return this.convertPermissionResponse(response);
     } catch (error51) {
       logger.error("Error handling MCP elicitation request", error51);
       return { action: "cancel", content: null, _meta: null };
@@ -24042,23 +24392,64 @@ var CodexElicitationHandler = class {
   requestOptions() {
     return this.cancellationSignal ? { cancellationSignal: this.cancellationSignal } : void 0;
   }
-  buildPermissionRequest(params) {
+  createMcpElicitationContext(params) {
+    const isToolApproval = isMcpToolCallApproval(params._meta);
+    const persistOptions = parsePersistOptions(params._meta);
+    const correlatedCallId = isToolApproval && (params.mode === "form" || params.mode === "openai/form") ? this.popPendingApproval(params.threadId, params.serverName) : void 0;
+    return { isToolApproval, persistOptions, correlatedCallId };
+  }
+  shouldUseAcpElicitation(params) {
+    switch (params.mode) {
+      case "form":
+        return clientSupportsFormElicitation(this.clientCapabilities);
+      case "url":
+        return clientSupportsUrlElicitation(this.clientCapabilities);
+      case "openai/form":
+        return false;
+    }
+  }
+  buildElicitationRequest(params, context) {
+    const base = {
+      sessionId: this.sessionState.sessionId,
+      ...context.correlatedCallId ? { toolCallId: context.correlatedCallId } : {},
+      message: params.message,
+      _meta: metaRecord(params._meta)
+    };
+    switch (params.mode) {
+      case "form": {
+        const requestedSchema = context.isToolApproval ? addPersistChoiceToSchema(
+          normalizeElicitationSchema(params.requestedSchema),
+          context.persistOptions
+        ) : normalizeElicitationSchema(params.requestedSchema);
+        return {
+          ...base,
+          mode: "form",
+          requestedSchema
+        };
+      }
+      case "url":
+        return {
+          ...base,
+          mode: "url",
+          url: params.url,
+          elicitationId: params.elicitationId
+        };
+    }
+  }
+  buildPermissionRequest(params, context) {
     const sessionId = this.sessionState.sessionId;
     const messageContent = {
       type: "content",
       content: { type: "text", text: params.message }
     };
-    const meta3 = params._meta;
-    const isToolApproval = isMcpToolCallApproval(meta3);
-    const options = isToolApproval ? buildToolApprovalOptions(parsePersistOptions(meta3)) : ELICITATION_OPTIONS;
+    const options = context.isToolApproval ? buildToolApprovalOptions(context.persistOptions) : ELICITATION_OPTIONS;
     if (params.mode === "form" || params.mode === "openai/form") {
-      const correlatedCallId = isToolApproval ? this.popPendingApproval(params.threadId, params.serverName) : void 0;
-      if (correlatedCallId !== void 0) {
+      if (context.correlatedCallId !== void 0) {
         return {
           request: {
             sessionId,
             toolCall: {
-              toolCallId: correlatedCallId,
+              toolCallId: context.correlatedCallId,
               kind: "execute",
               status: "pending"
               // content: [messageContent],   — omitted: already rendered via item/started
@@ -24067,7 +24458,7 @@ var CodexElicitationHandler = class {
             _meta: { is_mcp_tool_approval: true },
             options
           },
-          correlatedCallId
+          correlatedCallId: context.correlatedCallId
         };
       }
       return {
@@ -24075,12 +24466,12 @@ var CodexElicitationHandler = class {
           sessionId,
           toolCall: {
             toolCallId: `elicitation-${params.serverName}`,
-            kind: isToolApproval ? "execute" : "other",
+            kind: context.isToolApproval ? "execute" : "other",
             status: "pending",
             content: [messageContent],
             rawInput: { serverName: params.serverName, schema: params.requestedSchema }
           },
-          ...isToolApproval ? { _meta: { is_mcp_tool_approval: true } } : {},
+          ...context.isToolApproval ? { _meta: { is_mcp_tool_approval: true } } : {},
           options
         },
         correlatedCallId: void 0
@@ -24102,7 +24493,7 @@ var CodexElicitationHandler = class {
       };
     }
   }
-  convertResponse(response) {
+  convertPermissionResponse(response) {
     if (response.outcome.outcome === "cancelled") {
       return { action: "cancel", content: null, _meta: null };
     }
@@ -24118,6 +24509,59 @@ var CodexElicitationHandler = class {
     }
     return { action: "decline", content: null, _meta: null };
   }
+  convertElicitationResponse(response, context) {
+    if (CreateElicitationResponse.isAccept(response)) {
+      const content = contentRecord(response.content);
+      const persist = context.isToolApproval ? content["persist"] : void 0;
+      if (persist === "session" || persist === "always" || persist === "once") {
+        delete content["persist"];
+      }
+      return {
+        action: "accept",
+        content: jsonObjectOrNull(content),
+        _meta: elicitationResponseMeta(response, context, persist)
+      };
+    }
+    if (CreateElicitationResponse.isDecline(response)) {
+      return { action: "decline", content: null, _meta: elicitationResponseMeta(response, context) };
+    }
+    if (CreateElicitationResponse.isCancel(response)) {
+      return { action: "cancel", content: null, _meta: elicitationResponseMeta(response, context) };
+    }
+    if (CreateElicitationResponse.isCustom(response)) {
+      return { action: "cancel", content: null, _meta: null };
+    }
+    return { action: "cancel", content: null, _meta: null };
+  }
+  async publishAcceptedMcpToolApproval(context, accepted) {
+    if (!accepted || context.correlatedCallId === void 0) {
+      return;
+    }
+    await this.connection.notify(methods.client.session.update, {
+      sessionId: this.sessionState.sessionId,
+      update: { sessionUpdate: "tool_call_update", toolCallId: context.correlatedCallId, status: "in_progress" }
+    });
+  }
+  trackUrlElicitation(threadId, elicitationId) {
+    const existing = this.pendingUrlElicitations.get(threadId);
+    if (existing) {
+      existing.add(elicitationId);
+      return;
+    }
+    this.pendingUrlElicitations.set(threadId, /* @__PURE__ */ new Set([elicitationId]));
+  }
+  async completeUrlElicitations(threadId) {
+    const elicitationIds = this.pendingUrlElicitations.get(threadId);
+    if (!elicitationIds) {
+      return;
+    }
+    this.pendingUrlElicitations.delete(threadId);
+    for (const elicitationId of elicitationIds) {
+      await this.connection.notify(methods.client.elicitation.complete, {
+        elicitationId
+      });
+    }
+  }
   handleItemStarted(event) {
     if (event.item.type !== "mcpToolCall") {
       return;
@@ -24955,7 +25399,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "1.1.0",
+  version: "1.1.1",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -25005,16 +25449,16 @@ var package_default = {
   license: "Apache-2.0",
   type: "module",
   devDependencies: {
-    "@types/node": "^26.0.1",
+    "@types/node": "^26.1.0",
     esbuild: "^0.28.1",
     "mcp-hello-world": "^1.1.2",
-    tsx: "^4.20.6",
+    tsx: "^4.23.0",
     typescript: "^6.0.3",
-    vitest: "^4.1.9"
+    vitest: "^4.1.10"
   },
   dependencies: {
-    "@agentclientprotocol/sdk": "^1.1.0",
-    "@openai/codex": "^0.142.5",
+    "@agentclientprotocol/sdk": "^1.2.1",
+    "@openai/codex": "^0.143.0",
     diff: "^9.0.0",
     open: "^11.0.0",
     "vscode-jsonrpc": "^9.0.1",
@@ -26409,10 +26853,8 @@ function createMessageUpdates(item) {
   if (role !== "assistant") {
     return [];
   }
-  return contentBlocksFromResponseContent(item["content"]).map((content) => ({
-    sessionUpdate: "agent_message_chunk",
-    content
-  }));
+  const phase = stringValue(item["phase"]);
+  return contentBlocksFromResponseContent(item["content"]).map((content) => createAgentMessageChunk(content, void 0, createCodexMessagePhaseMeta(phase)));
 }
 function createEventMsgUpdates(record2) {
   if (record2["type"] !== "event_msg") {
@@ -27262,6 +27704,7 @@ var CodexAcpServer = class _CodexAcpServer {
   getRecentStderr;
   availableCommands;
   clientInfo;
+  clientCapabilities;
   terminalOutputMode;
   booleanConfigOptionsSupported;
   sessions;
@@ -27285,6 +27728,7 @@ var CodexAcpServer = class _CodexAcpServer {
     this.getExitCode = getExitCode ?? (() => null);
     this.getRecentStderr = getRecentStderr ?? (() => "");
     this.clientInfo = null;
+    this.clientCapabilities = null;
     this.terminalOutputMode = "terminal_output_delta";
     this.booleanConfigOptionsSupported = false;
     this.availableCommands = new CodexCommands(
@@ -27297,6 +27741,7 @@ var CodexAcpServer = class _CodexAcpServer {
   async initialize(_params) {
     logger.log("Initialize request received");
     this.clientInfo = _params.clientInfo ?? null;
+    this.clientCapabilities = _params.clientCapabilities ?? null;
     this.terminalOutputMode = resolveTerminalOutputMode(_params.clientCapabilities);
     this.booleanConfigOptionsSupported = clientSupportsBooleanConfigOptions(_params.clientCapabilities);
     await this.runWithProcessCheck(() => this.codexAcpClient.initialize(_params));
@@ -27974,12 +28419,15 @@ You have been logged out. Please try again.`);
       case "subAgentActivity":
       case "sleep":
         return [];
-      case "agentMessage":
+      case "agentMessage": {
+        const meta3 = createCodexMessagePhaseMeta(item.phase);
         return [{
           sessionUpdate: "agent_message_chunk",
           messageId: item.id,
-          content: { type: "text", text: item.text }
+          content: { type: "text", text: item.text },
+          ...meta3 ? { _meta: meta3 } : {}
         }];
+      }
       case "reasoning":
         return this.createReasoningUpdates(item);
       case "fileChange":
@@ -28360,11 +28808,16 @@ ${item.text}`
     try {
       const eventHandler = new CodexEventHandler(this.connection, sessionState);
       const approvalHandler = new CodexApprovalHandler(this.connection, sessionState, activePrompt.signal);
-      const elicitationHandler = new CodexElicitationHandler(this.connection, sessionState, activePrompt.signal);
+      const elicitationHandler = new CodexElicitationHandler(
+        this.connection,
+        sessionState,
+        this.clientCapabilities,
+        activePrompt.signal
+      );
       await this.codexAcpClient.subscribeToSessionEvents(
         params.sessionId,
-        (event) => {
-          elicitationHandler.handleNotification(event);
+        async (event) => {
+          await elicitationHandler.handleNotification(event);
           return eventHandler.handleNotification(event);
         },
         approvalHandler,