chore(merge): resolve conflicts for bulk import — keep both schemas and all i18n keys

src/shared/validation/schemas.ts

@@ -322,6 +322,21 @@ export const bulkCreateProviderSchema = z
     }
   });
 
+// ──── Codex Import Schema ────
+
+export const importCodexAuthSchema = z.object({
+  source: z.discriminatedUnion("kind", [
+    z.object({ kind: z.literal("json"), json: z.unknown() }),
+    z.object({
+      kind: z.literal("text"),
+      text: z.string().max(256 * 1024, "Paste content must be under 256 KB"),
+    }),
+  ]),
+  name: z.string().min(1).max(200).optional(),
+  email: z.string().email("Must be a valid email").optional(),
+  overwriteExisting: z.boolean().optional(),
+});
+
 // ──── Codex Import Bulk Schema ────
 
 export const importCodexAuthBulkSchema = z.object({